zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

Reformat project

Browse source
This commit is contained in:
broccolai 2020-12-07 12:01:30 +00:00 • committed by Alexander Söderberg
parent 01d36aecd8
commit 237eda75ef
30 changed files with 130 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java
View file

@ -170,10 +170,10 @@ public final class CommandFlag<T> {
}
if (alias.length() > 1) {
throw new IllegalArgumentException(
String.format(
"Alias '%s' has name longer than one character. This is not allowed",
alias
)
String.format(
"Alias '%s' has name longer than one character. This is not allowed",
alias
)
);
}
filteredAliases.add(alias);

3
cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArgument.java
View file

@ -346,7 +346,8 @@ public final class StringArgument<C> extends CommandArgument<C, String> {
inner = inputQueue.remove();
if (inner.startsWith("\"") || inner.startsWith("'")) {
return ArgumentParseResult.failure(new StringParseException(sj.toString(),
StringMode.QUOTED, commandContext));
StringMode.QUOTED, commandContext
));
}
}

8
cloud-core/src/main/java/cloud/commandframework/arguments/standard/StringArrayArgument.java
View file

@ -62,9 +62,9 @@ public final class StringArrayArgument<C> extends CommandArgument<C, String[]> {
/**
* Create a new required string array argument
*
* @param name Argument name
* @param name Argument name
* @param suggestionsProvider Suggestions provider
* @param <C> Command sender type
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull StringArrayArgument<C> of(
@ -81,9 +81,9 @@ public final class StringArrayArgument<C> extends CommandArgument<C, String[]> {
/**
* Create a new optional string array argument
*
* @param name Argument name
* @param name Argument name
* @param suggestionsProvider Suggestions provider
* @param <C> Command sender type
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull StringArrayArgument<C> optional(

2
cloud-core/src/main/java/cloud/commandframework/context/CommandContextFactory.java
View file

@ -45,6 +45,6 @@ public interface CommandContextFactory<C> {
boolean suggestions,
@NonNull C sender,
@NonNull CaptionRegistry<C> captionRegistry
);
);
}

37
cloud-core/src/test/java/cloud/commandframework/CommandRegistrationStateTest.java
View file

@ -41,37 +41,52 @@ public class CommandRegistrationStateTest {
@Test
void testRegistrationChangesState() {
final TestCommandManager manager = new TestCommandManager();
manager.command(manager.commandBuilder("test").handler(ctx -> {}));
manager.command(manager.commandBuilder("test").handler(ctx -> {
}));
assertEquals(CommandManager.RegistrationState.REGISTERING, manager.getRegistrationState());
// And a second registration maintains it
manager.command(manager.commandBuilder("test2").handler(ctx -> {}));
manager.command(manager.commandBuilder("test2").handler(ctx -> {
}));
assertEquals(CommandManager.RegistrationState.REGISTERING, manager.getRegistrationState());
}
@Test
void testChangingRegistrationHandlerFails() {
final TestCommandManager manager = new TestCommandManager();
manager.command(manager.commandBuilder("test").handler(ctx -> {}));
assertThrows(IllegalStateException.class,
() -> manager.setCommandRegistrationHandler(CommandRegistrationHandler.nullCommandRegistrationHandler()));
manager.command(manager.commandBuilder("test").handler(ctx -> {
}));
assertThrows(
IllegalStateException.class,
() -> manager.setCommandRegistrationHandler(CommandRegistrationHandler.nullCommandRegistrationHandler())
);
}
@Test
void testRegistrationFailsInAfterRegistrationState() {
final TestCommandManager manager = new TestCommandManager();
manager.command(manager.commandBuilder("test").handler(ctx -> {}));
manager.command(manager.commandBuilder("test").handler(ctx -> {
}));
manager.transitionOrThrow(CommandManager.RegistrationState.REGISTERING, CommandManager.RegistrationState.AFTER_REGISTRATION);
assertThrows(IllegalStateException.class, () -> manager.command(manager.commandBuilder("test2").handler(ctx -> {})));
manager.transitionOrThrow(
CommandManager.RegistrationState.REGISTERING,
CommandManager.RegistrationState.AFTER_REGISTRATION
);
assertThrows(IllegalStateException.class, () -> manager.command(manager.commandBuilder("test2").handler(ctx -> {
})));
}
@Test
void testAllowUnsafeRegistration() {
final TestCommandManager manager = new TestCommandManager();
manager.setSetting(CommandManager.ManagerSettings.ALLOW_UNSAFE_REGISTRATION, true);
manager.command(manager.commandBuilder("test").handler(ctx -> {}));
manager.transitionOrThrow(CommandManager.RegistrationState.REGISTERING, CommandManager.RegistrationState.AFTER_REGISTRATION);
manager.command(manager.commandBuilder("unsafe").handler(ctx -> {}));
manager.command(manager.commandBuilder("test").handler(ctx -> {
}));
manager.transitionOrThrow(
CommandManager.RegistrationState.REGISTERING,
CommandManager.RegistrationState.AFTER_REGISTRATION
);
manager.command(manager.commandBuilder("unsafe").handler(ctx -> {
}));
}
}

12
cloud-core/src/test/java/cloud/commandframework/CommandSuggestionsTest.java
View file

@ -217,8 +217,10 @@ public class CommandSuggestionsTest {
Assertions.assertEquals(Arrays.asList("-1", "-2", "-3", "-4", "-5", "-6", "-7", "-8", "-9"), suggestions3);
final String input4 = "numbers -1";
final List<String> suggestions4 = manager.suggest(new TestCommandSender(), input4);
Assertions.assertEquals(Arrays.asList("-1", "-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17", "-18", "-19"),
suggestions4);
Assertions.assertEquals(
Arrays.asList("-1", "-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17", "-18", "-19"),
suggestions4
);
final String input5 = "numberswithmin ";
final List<String> suggestions5 = manager.suggest(new TestCommandSender(), input5);
Assertions.assertEquals(Arrays.asList("5", "6", "7", "8", "9"), suggestions5);
@ -237,8 +239,10 @@ public class CommandSuggestionsTest {
Assertions.assertEquals(Arrays.asList("-1", "-2", "-3", "-4", "-5", "-6", "-7", "-8", "-9"), suggestions3);
final String input4 = "numberswithfollowingargument -1";
final List<String> suggestions4 = manager.suggest(new TestCommandSender(), input4);
Assertions.assertEquals(Arrays.asList("-1", "-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17", "-18", "-19"),
suggestions4);
Assertions.assertEquals(
Arrays.asList("-1", "-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17", "-18", "-19"),
suggestions4
);
}
@Test

4
cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java
View file

@ -150,8 +150,8 @@ class CommandTreeTest {
/* Build command for testing multiple optionals */
manager.command(
manager.commandBuilder("optionals")
.argument(StringArgument.optional("opt1"))
.argument(StringArgument.optional("opt2"))
.argument(StringArgument.optional("opt1"))
.argument(StringArgument.optional("opt2"))
);
}

10
cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java
View file

@ -65,11 +65,11 @@ public class ParserRegistryTest {
@Override
public boolean equals(final Object obj) {
if (!(obj instanceof Range)) {
return false;
}
final Range range = (Range) obj;
return this.min().equals(range.min()) && this.max().equals(range.max());
if (!(obj instanceof Range)) {
return false;
}
final Range range = (Range) obj;
return this.min().equals(range.min()) && this.max().equals(range.max());
}
@Override

6
cloud-core/src/test/java/cloud/commandframework/arguments/standard/StringArgumentTest.java
View file

@ -92,8 +92,10 @@ class StringArgumentTest {
Assertions.assertEquals("quoted \" string", storage[0]);
Assertions.assertEquals("unquoted", storage[1]);
clear();
Assertions.assertThrows(CompletionException.class, () -> manager.executeCommand(new TestCommandSender(),
"'quoted quoted unquoted").join());
Assertions.assertThrows(CompletionException.class, () -> manager.executeCommand(
new TestCommandSender(),
"'quoted quoted unquoted"
).join());
}
@Test