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

🎨 required-> of

Browse source
This commit is contained in:
Alexander Söderberg 2020-10-01 13:20:29 +02:00
parent 8d60348533
commit ee59066733
No known key found for this signature in database
GPG key ID: C0207FF7EA146678
27 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cloud-core/src/main/java/cloud/commandframework/Command.java
View file

@ -145,7 +145,7 @@ public class Command<C> {
@NonNull final Description description,
@NonNull final String... aliases) {
final Map<@NonNull CommandArgument<C, ?>, @NonNull Description> map = new LinkedHashMap<>();
map.put(StaticArgument.required(commandName, aliases), description);
map.put(StaticArgument.of(commandName, aliases), description);
return new Builder<>(null, commandMeta, null, map,
new CommandExecutionHandler.NullCommandExecutionHandler<>(), Permission.empty());
}
@ -164,7 +164,7 @@ public class Command<C> {
@NonNull final CommandMeta commandMeta,
@NonNull final String... aliases) {
final Map<CommandArgument<C, ?>, Description> map = new LinkedHashMap<>();
map.put(StaticArgument.required(commandName, aliases), Description.empty());
map.put(StaticArgument.of(commandName, aliases), Description.empty());
return new Builder<>(null, commandMeta, null, map,
new CommandExecutionHandler.NullCommandExecutionHandler<>(), Permission.empty());
}
@ -308,7 +308,7 @@ public class Command<C> {
*/
public @NonNull Builder<C> literal(@NonNull final String main,
@NonNull final String... aliases) {
return this.argument(StaticArgument.required(main, aliases));
return this.argument(StaticArgument.of(main, aliases));
}
/**
@ -322,7 +322,7 @@ public class Command<C> {
public @NonNull Builder<C> literal(@NonNull final String main,
@NonNull final Description description,
@NonNull final String... aliases) {
return this.argument(StaticArgument.required(main, aliases), description);
return this.argument(StaticArgument.of(main, aliases), description);
}
/**
@ -398,7 +398,7 @@ public class Command<C> {
if (this.commandManager == null) {
throw new IllegalStateException("This cannot be called from a command that has no command manager attached");
}
return this.argument(ArgumentPair.required(this.commandManager, name, names, parserPair).simple(), description);
return this.argument(ArgumentPair.of(this.commandManager, name, names, parserPair).simple(), description);
}
/**
@ -431,7 +431,7 @@ public class Command<C> {
throw new IllegalStateException("This cannot be called from a command that has no command manager attached");
}
return this.argument(
ArgumentPair.required(this.commandManager, name, names, parserPair).withMapper(outputType, mapper),
ArgumentPair.of(this.commandManager, name, names, parserPair).withMapper(outputType, mapper),
description);
}
@ -460,7 +460,7 @@ public class Command<C> {
if (this.commandManager == null) {
throw new IllegalStateException("This cannot be called from a command that has no command manager attached");
}
return this.argument(ArgumentTriplet.required(this.commandManager, name, names, parserTriplet).simple(), description);
return this.argument(ArgumentTriplet.of(this.commandManager, name, names, parserTriplet).simple(), description);
}
/**
@ -495,7 +495,7 @@ public class Command<C> {
throw new IllegalStateException("This cannot be called from a command that has no command manager attached");
}
return this.argument(
ArgumentTriplet.required(this.commandManager, name, names, parserTriplet).withMapper(outputType, mapper),
ArgumentTriplet.of(this.commandManager, name, names, parserTriplet).withMapper(outputType, mapper),
description);
}

2
cloud-core/src/main/java/cloud/commandframework/arguments/StaticArgument.java
View file

@ -56,7 +56,7 @@ public final class StaticArgument<C> extends CommandArgument<C, String> {
* @param <C> Command sender type
* @return Constructed argument
*/
public static <C> @NonNull StaticArgument<C> required(@NonNull final String name,
public static <C> @NonNull StaticArgument<C> of(@NonNull final String name,
@NonNull final String... aliases) {
return new StaticArgument<>(true, name, aliases);
}

2
cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentPair.java
View file

@ -78,7 +78,7 @@ public class ArgumentPair<C, U, V, O> extends CompoundArgument<Pair<U, V>, C, O>
* @param <V> Second parsed type
* @return Intermediary builder
*/
public static <C, U, V> @NonNull ArgumentPairIntermediaryBuilder<C, U, V> required(@NonNull final CommandManager<C> manager,
public static <C, U, V> @NonNull ArgumentPairIntermediaryBuilder<C, U, V> of(@NonNull final CommandManager<C> manager,
@NonNull final String name,
@NonNull final Pair<@NonNull String,
@NonNull String> names,

2
cloud-core/src/main/java/cloud/commandframework/arguments/compound/ArgumentTriplet.java
View file

@ -82,7 +82,7 @@ public class ArgumentTriplet<C, U, V, W, O> extends CompoundArgument<Triplet<U,
* @return Intermediary builder
*/
public static <C, U, V, W> @NonNull ArgumentTripletIntermediaryBuilder<@NonNull C, @NonNull U, @NonNull V, @NonNull W>
required(@NonNull final CommandManager<C> manager,
of(@NonNull final CommandManager<C> manager,
@NonNull final String name,
@NonNull final Triplet<@NonNull String, @NonNull String, @NonNull String> names,
@NonNull final Triplet<@NonNull Class<U>, @NonNull Class<V>, @NonNull Class<W>> types) {

2
cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java
View file

@ -67,7 +67,7 @@ public final class BooleanArgument<C> extends CommandArgument<C, Boolean> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Boolean> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Boolean> of(@NonNull final String name) {
return BooleanArgument.<C>newBuilder(name).asRequired().build();
}

2
cloud-core/src/main/java/cloud/commandframework/arguments/standard/ByteArgument.java
View file

@ -71,7 +71,7 @@ public final class ByteArgument<C> extends CommandArgument<C, Byte> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Byte> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Byte> of(@NonNull final String name) {
return ByteArgument.<C>newBuilder(name).asRequired().build();
}

2
cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java
View file

@ -63,7 +63,7 @@ public final class CharArgument<C> extends CommandArgument<C, Character> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Character> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Character> of(@NonNull final String name) {
return CharArgument.<C>newBuilder(name).asRequired().build();
}

2
cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java
View file

@ -71,7 +71,7 @@ public final class DoubleArgument<C> extends CommandArgument<C, Double> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Double> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Double> of(@NonNull final String name) {
return DoubleArgument.<C>newBuilder(name).asRequired().build();
}

2
cloud-core/src/main/java/cloud/commandframework/arguments/standard/EnumArgument.java
View file

@ -78,7 +78,7 @@ public class EnumArgument<C, E extends Enum<E>> extends CommandArgument<C, E> {
* @param <E> Enum type
* @return Created argument
*/
public static <C, E extends Enum<E>> @NonNull CommandArgument<C, E> required(
public static <C, E extends Enum<E>> @NonNull CommandArgument<C, E> of(
@NonNull final Class<E> enumClass,
@NonNull final String name) {
return EnumArgument.<C, E>newBuilder(enumClass, name).asRequired().build();

2
cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java
View file

@ -71,7 +71,7 @@ public final class FloatArgument<C> extends CommandArgument<C, Float> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Float> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Float> of(@NonNull final String name) {
return FloatArgument.<C>newBuilder(name).asRequired().build();
}

2
cloud-core/src/main/java/cloud/commandframework/arguments/standard/IntegerArgument.java
View file

@ -78,7 +78,7 @@ public final class IntegerArgument<C> extends CommandArgument<C, Integer> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Integer> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Integer> of(@NonNull final String name) {
return IntegerArgument.<C>newBuilder(name).asRequired().build();
}

2
cloud-core/src/main/java/cloud/commandframework/arguments/standard/LongArgument.java
View file

@ -71,7 +71,7 @@ public final class LongArgument<C> extends CommandArgument<C, Long> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Long> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Long> of(@NonNull final String name) {
return LongArgument.<C>newBuilder(name).asRequired().build();
}

2
cloud-core/src/main/java/cloud/commandframework/arguments/standard/ShortArgument.java
View file

@ -71,7 +71,7 @@ public final class ShortArgument<C> extends CommandArgument<C, Short> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Short> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Short> of(@NonNull final String name) {
return ShortArgument.<C>newBuilder(name).asRequired().build();
}

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

@ -69,7 +69,7 @@ public final class StringArgument<C> extends CommandArgument<C, String> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, String> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, String> of(@NonNull final String name) {
return StringArgument.<C>newBuilder(name).single().asRequired().build();
}
@ -81,7 +81,7 @@ public final class StringArgument<C> extends CommandArgument<C, String> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, String> required(@NonNull final String name,
public static <C> @NonNull CommandArgument<C, String> of(@NonNull final String name,
@NonNull final StringMode stringMode) {
return StringArgument.<C>newBuilder(name).withMode(stringMode).asRequired().build();
}

2
cloud-core/src/main/java/cloud/commandframework/arguments/standard/UUIDArgument.java
View file

@ -64,7 +64,7 @@ public final class UUIDArgument<C> extends CommandArgument<C, UUID> {
* @param <C> Command sender type
* @return Created component
*/
public static <C> @NonNull CommandArgument<C, UUID> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, UUID> of(@NonNull final String name) {
return UUIDArgument.<C>newBuilder(name).asRequired().build();
}

2
cloud-core/src/test/java/cloud/commandframework/CommandHelpHandlerTest.java
View file

@ -47,7 +47,7 @@ class CommandHelpHandlerTest {
manager.command(manager.commandBuilder("test", meta1).literal("this").literal("thing").build());
final SimpleCommandMeta meta2 = SimpleCommandMeta.builder().with("description", "Command with variables").build();
manager.command(manager.commandBuilder("test", meta2).literal("int").
argument(IntegerArgument.required("int"), Description.of("A number")).build());
argument(IntegerArgument.of("int"), Description.of("A number")).build());
manager.command(manager.commandBuilder("vec")
.meta("description", "Takes in a vector")

2
cloud-core/src/test/java/cloud/commandframework/CommandPreProcessorTest.java
View file

@ -40,7 +40,7 @@ public class CommandPreProcessorTest {
static void newTree() {
manager = new TestCommandManager();
manager.command(manager.commandBuilder("test", SimpleCommandMeta.empty())
.argument(EnumArgument.required(SampleEnum.class, "enum"))
.argument(EnumArgument.of(SampleEnum.class, "enum"))
.handler(
commandContext -> System.out.printf("enum = %s | integer = %d\n",
commandContext.<SampleEnum>get(

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

@ -49,7 +49,7 @@ public class CommandSuggestionsTest {
.argument(StringArgument.<TestCommandSender>newBuilder("str")
.withSuggestionsProvider((c, s) -> Arrays.asList("one", "two"))
.build())
.argument(EnumArgument.required(TestEnum.class, "enum"))
.argument(EnumArgument.of(TestEnum.class, "enum"))
.build());
manager.command(manager.commandBuilder("test")
.literal("comb")
@ -68,7 +68,7 @@ public class CommandSuggestionsTest {
manager.command(manager.commandBuilder("com")
.argumentPair("com", Pair.of("x", "y"), Pair.of(Integer.class, TestEnum.class),
Description.empty())
.argument(IntegerArgument.required("int"))
.argument(IntegerArgument.of("int"))
.build());
manager.command(manager.commandBuilder("com2")

2
cloud-core/src/test/java/cloud/commandframework/CommandTest.java
View file

@ -39,7 +39,7 @@ class CommandTest {
void ensureOrdering() {
Assertions.assertThrows(IllegalArgumentException.class, () ->
Command.newBuilder("test", SimpleCommandMeta.empty()).argument(StaticArgument.optional("something"))
.argument(StaticArgument.required("somethingelse")).build());
.argument(StaticArgument.of("somethingelse")).build());
}
}

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

@ -65,8 +65,8 @@ class CommandTreeTest {
/* Build command to test command proxying */
final Command<TestCommandSender> toProxy = manager.commandBuilder("test")
.literal("unproxied")
.argument(StringArgument.required("string"))
.argument(IntegerArgument.required("int"))
.argument(StringArgument.of("string"))
.argument(IntegerArgument.of("int"))
.literal("anotherliteral")
.handler(c -> {})
.build();
@ -86,7 +86,7 @@ class CommandTreeTest {
/* Build command for testing compound types */
manager.command(manager.commandBuilder("pos")
.argument(ArgumentPair.required(manager, "pos", Pair.of("x", "y"),
.argument(ArgumentPair.of(manager, "pos", Pair.of("x", "y"),
Pair.of(Integer.class, Integer.class))
.simple())
.handler(c -> {
@ -95,7 +95,7 @@ class CommandTreeTest {
})
.build());
manager.command(manager.commandBuilder("vec")
.argument(ArgumentPair.required(manager, "vec", Pair.of("x", "y"),
.argument(ArgumentPair.of(manager, "vec", Pair.of("x", "y"),
Pair.of(Double.class, Double.class))
.withMapper(Vector2.class,
pair -> new Vector2(pair.getFirst(), pair.getSecond()))

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

@ -39,8 +39,8 @@ class StringArgumentTest {
static void setup() {
manager = new TestCommandManager();
manager.command(manager.commandBuilder("quoted")
.argument(StringArgument.required("message1", StringArgument.StringMode.QUOTED))
.argument(StringArgument.required("message2"))
.argument(StringArgument.of("message1", StringArgument.StringMode.QUOTED))
.argument(StringArgument.of("message2"))
.handler(c -> {
final String message1 = c.getRequired("message1");
final String message2 = c.getRequired("message2");
@ -49,14 +49,14 @@ class StringArgumentTest {
})
.build());
manager.command(manager.commandBuilder("single")
.argument(StringArgument.required("message"))
.argument(StringArgument.of("message"))
.handler(c -> {
final String message = c.getRequired("message");
storage[0] = message;
})
.build());
manager.command(manager.commandBuilder("greedy")
.argument(StringArgument.required("message", StringArgument.StringMode.GREEDY))
.argument(StringArgument.of("message", StringArgument.StringMode.GREEDY))
.handler(c -> {
final String message = c.getRequired("message");
storage[0] = message;

4
cloud-jline/src/main/java/cloud/commandframework/jline/JLineCommandManager.java
View file

@ -100,11 +100,11 @@ public class JLineCommandManager extends CommandManager<JLineCommandSender> impl
System.out::println))
.build())
.command(jLineCommandManager.commandBuilder("test", SimpleCommandMeta.empty())
.argument(StaticArgument.required("one"))
.argument(StaticArgument.of("one"))
.handler(commandContext -> System.out.println("Test (1)"))
.build())
.command(jLineCommandManager.commandBuilder("test", SimpleCommandMeta.empty())
.argument(StaticArgument.required("two"))
.argument(StaticArgument.of("two"))
.handler(commandContext -> System.out.println("Test (2)"))
.build());
System.out.println("Ready...");

20
cloud-minecraft/cloud-bukkit-test/src/main/java/cloud/commandframework/BukkitTest.java
View file

@ -122,7 +122,7 @@ public final class BukkitTest extends JavaPlugin {
annotationParser.parse(this);
mgr.command(mgr.commandBuilder("gamemode", this.metaWithDescription("Your ugli"), "gajmöde")
.argument(EnumArgument.required(GameMode.class, "gamemode"))
.argument(EnumArgument.of(GameMode.class, "gamemode"))
.argument(StringArgument.<CommandSender>newBuilder("player")
.withSuggestionsProvider((v1, v2) -> {
final List<String> suggestions =
@ -172,8 +172,8 @@ public final class BukkitTest extends JavaPlugin {
.build())
.command(mgr.commandBuilder("give")
.withSenderType(Player.class)
.argument(EnumArgument.required(Material.class, "material"))
.argument(IntegerArgument.required("amount"))
.argument(EnumArgument.of(Material.class, "material"))
.argument(IntegerArgument.of("amount"))
.handler(c -> {
final Material material = c.getRequired("material");
final int amount = c.getRequired("amount");
@ -185,7 +185,7 @@ public final class BukkitTest extends JavaPlugin {
.command(mgr.commandBuilder("worldtp", BukkitCommandMetaBuilder.builder()
.withDescription("Teleport to a world")
.build())
.argument(WorldArgument.required("world"))
.argument(WorldArgument.of("world"))
.handler(c -> {
final World world = c.getRequired("world");
((Player) c.getSender()).teleport(world.getSpawnLocation());
@ -193,11 +193,11 @@ public final class BukkitTest extends JavaPlugin {
})
.build())
.command(mgr.commandBuilder("brigadier")
.argument(FloatArgument.required("float"))
.argument(DoubleArgument.required("double"))
.argument(IntegerArgument.required("int"))
.argument(BooleanArgument.required("bool"))
.argument(StringArgument.required("string"))
.argument(FloatArgument.of("float"))
.argument(DoubleArgument.of("double"))
.argument(IntegerArgument.of("int"))
.argument(BooleanArgument.of("bool"))
.argument(StringArgument.of("string"))
.handler(c -> c.getSender().sendMessage("Executed the command"))
.build())
.command(mgr.commandBuilder("annotationass")
@ -226,7 +226,7 @@ public final class BukkitTest extends JavaPlugin {
manager.command(mgr.commandBuilder("teleport")
.meta("description", "Takes in a location and teleports the player there")
.withSenderType(Player.class)
.argument(WorldArgument.required("world"), Description.of("World name"))
.argument(WorldArgument.of("world"), Description.of("World name"))
.argumentTriplet("coords",
TypeToken.get(Vector.class),
Triplet.of("x", "y", "z"),

2
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/MaterialArgument.java
View file

@ -70,7 +70,7 @@ public class MaterialArgument<C> extends CommandArgument<C, Material> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Material> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Material> of(@NonNull final String name) {
return MaterialArgument.<C>newBuilder(name).asRequired().build();
}

2
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java
View file

@ -75,7 +75,7 @@ public final class OfflinePlayerArgument<C> extends CommandArgument<C, OfflinePl
* @param <C> Command sender type
* @return Created component
*/
public static <C> @NonNull CommandArgument<C, OfflinePlayer> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, OfflinePlayer> of(@NonNull final String name) {
return OfflinePlayerArgument.<C>newBuilder(name).asRequired().build();
}

2
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerArgument.java
View file

@ -71,7 +71,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
* @param <C> Command sender type
* @return Created component
*/
public static <C> @NonNull CommandArgument<C, Player> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, Player> of(@NonNull final String name) {
return PlayerArgument.<C>newBuilder(name).asRequired().build();
}

2
cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/WorldArgument.java
View file

@ -69,7 +69,7 @@ public class WorldArgument<C> extends CommandArgument<C, World> {
* @param <C> Command sender type
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, World> required(@NonNull final String name) {
public static <C> @NonNull CommandArgument<C, World> of(@NonNull final String name) {
return WorldArgument.<C>newBuilder(name).asRequired().build();
}