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

Deprecate argument newBuilder methods and add builder methods to align with newer arguments (#419)

Browse source
This commit is contained in:
Jason 2022-12-13 08:54:54 -07:00
parent 306a1def9a
commit 99d388b708
39 changed files with 634 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -873,7 +873,7 @@ public abstract class CommandManager<C> {
* @return Flag builder
*/
public CommandFlag.@NonNull Builder<Void> flagBuilder(final @NonNull String name) {
return CommandFlag.newBuilder(name);
return CommandFlag.builder(name);
}
/**

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

@ -71,12 +71,27 @@ public final class CommandFlag<T> {
this.mode = Objects.requireNonNull(mode, "mode cannot be null");
}
/**
* Create a new {@link Builder}.
*
* @param name flag name
* @return new {@link Builder}
* @since 1.8.0
*/
@API(status = API.Status.STABLE, since = "1.8.0")
public static @NonNull Builder<Void> builder(final @NonNull String name) {
return new Builder<>(name);
}
/**
* Create a new flag builder
*
* @param name Flag name
* @return Flag builder
* @deprecated prefer {@link #builder(String)}
*/
@API(status = API.Status.DEPRECATED, since = "1.8.0")
@Deprecated
public static @NonNull Builder<Void> newBuilder(final @NonNull String name) {
return new Builder<>(name);
}

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

@ -63,15 +63,31 @@ public final class BooleanArgument<C> extends CommandArgument<C, Boolean> {
this.liberal = liberal;
}
/**
* Create a new {@link Builder}.
*
* @param name argument name
* @param <C> sender type
* @return new {@link Builder}
* @since 1.8.0
*/
@API(status = API.Status.STABLE, since = "1.8.0")
public static <C> @NonNull Builder<C> builder(final @NonNull String name) {
return new Builder<>(name);
}
/**
* Create a new builder
*
* @param name Name of the argument
* @param <C> Command sender type
* @return Created builder
* @deprecated prefer {@link #builder(String)}
*/
@API(status = API.Status.DEPRECATED, since = "1.8.0")
@Deprecated
public static <C> @NonNull Builder<C> newBuilder(final @NonNull String name) {
return new Builder<>(name);
return builder(name);
}
/**
@ -82,7 +98,7 @@ public final class BooleanArgument<C> extends CommandArgument<C, Boolean> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Boolean> of(final @NonNull String name) {
return BooleanArgument.<C>newBuilder(name).asRequired().build();
return BooleanArgument.<C>builder(name).asRequired().build();
}
/**
@ -93,7 +109,7 @@ public final class BooleanArgument<C> extends CommandArgument<C, Boolean> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Boolean> optional(final @NonNull String name) {
return BooleanArgument.<C>newBuilder(name).asOptional().build();
return BooleanArgument.<C>builder(name).asOptional().build();
}
/**
@ -108,7 +124,7 @@ public final class BooleanArgument<C> extends CommandArgument<C, Boolean> {
final @NonNull String name,
final boolean defaultBoolean
) {
return BooleanArgument.<C>newBuilder(name).asOptionalWithDefault(Boolean.toString(defaultBoolean)).build();
return BooleanArgument.<C>builder(name).asOptionalWithDefault(Boolean.toString(defaultBoolean)).build();
}
/**

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

@ -64,12 +64,28 @@ public final class ByteArgument<C> extends CommandArgument<C, Byte> {
/**
* Create a new {@link Builder}.
*
* @param name argument name
* @param <C> sender type
* @return new {@link Builder}
* @since 1.8.0
*/
@API(status = API.Status.STABLE, since = "1.8.0")
public static <C> @NonNull Builder<C> builder(final @NonNull String name) {
return new Builder<>(name);
}
/**
* Create a new builder
*
* @param name Name of the argument
* @param <C> Command sender type
* @return Created builder
* @deprecated prefer {@link #builder(String)}
*/
@API(status = API.Status.DEPRECATED, since = "1.8.0")
@Deprecated
public static <C> @NonNull Builder<C> newBuilder(final @NonNull String name) {
return new Builder<>(name);
return builder(name);
}
/**
@ -80,7 +96,7 @@ public final class ByteArgument<C> extends CommandArgument<C, Byte> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Byte> of(final @NonNull String name) {
return ByteArgument.<C>newBuilder(name).asRequired().build();
return ByteArgument.<C>builder(name).asRequired().build();
}
/**
@ -91,7 +107,7 @@ public final class ByteArgument<C> extends CommandArgument<C, Byte> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Byte> optional(final @NonNull String name) {
return ByteArgument.<C>newBuilder(name).asOptional().build();
return ByteArgument.<C>builder(name).asOptional().build();
}
/**
@ -106,7 +122,7 @@ public final class ByteArgument<C> extends CommandArgument<C, Byte> {
final @NonNull String name,
final byte defaultNum
) {
return ByteArgument.<C>newBuilder(name).asOptionalWithDefault(defaultNum).build();
return ByteArgument.<C>builder(name).asOptionalWithDefault(defaultNum).build();
}
/**

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

@ -55,15 +55,31 @@ public final class CharArgument<C> extends CommandArgument<C, Character> {
super(required, name, new CharacterParser<>(), defaultValue, Character.class, suggestionsProvider, defaultDescription);
}
/**
* Create a new {@link Builder}.
*
* @param name argument name
* @param <C> sender type
* @return new {@link Builder}
* @since 1.8.0
*/
@API(status = API.Status.STABLE, since = "1.8.0")
public static <C> @NonNull Builder<C> builder(final @NonNull String name) {
return new Builder<>(name);
}
/**
* Create a new builder
*
* @param name Name of the argument
* @param <C> Command sender type
* @return Created builder
* @deprecated prefer {@link #builder(String)}
*/
public static <C> CharArgument.@NonNull Builder<C> newBuilder(final @NonNull String name) {
return new CharArgument.Builder<>(name);
@API(status = API.Status.DEPRECATED, since = "1.8.0")
@Deprecated
public static <C> @NonNull Builder<C> newBuilder(final @NonNull String name) {
return builder(name);
}
/**
@ -74,7 +90,7 @@ public final class CharArgument<C> extends CommandArgument<C, Character> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Character> of(final @NonNull String name) {
return CharArgument.<C>newBuilder(name).asRequired().build();
return CharArgument.<C>builder(name).asRequired().build();
}
/**
@ -85,7 +101,7 @@ public final class CharArgument<C> extends CommandArgument<C, Character> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Character> optional(final @NonNull String name) {
return CharArgument.<C>newBuilder(name).asOptional().build();
return CharArgument.<C>builder(name).asOptional().build();
}
/**
@ -100,7 +116,7 @@ public final class CharArgument<C> extends CommandArgument<C, Character> {
final @NonNull String name,
final @NonNull String defaultNum
) {
return CharArgument.<C>newBuilder(name).asOptionalWithDefault(defaultNum).build();
return CharArgument.<C>builder(name).asOptionalWithDefault(defaultNum).build();
}

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

@ -64,12 +64,28 @@ public final class DoubleArgument<C> extends CommandArgument<C, Double> {
/**
* Create a new {@link Builder}.
*
* @param name argument name
* @param <C> sender type
* @return new {@link Builder}
* @since 1.8.0
*/
@API(status = API.Status.STABLE, since = "1.8.0")
public static <C> @NonNull Builder<C> builder(final @NonNull String name) {
return new Builder<>(name);
}
/**
* Create a new builder
*
* @param name Name of the argument
* @param <C> Command sender type
* @return Created builder
* @deprecated prefer {@link #builder(String)}
*/
@API(status = API.Status.DEPRECATED, since = "1.8.0")
@Deprecated
public static <C> @NonNull Builder<C> newBuilder(final @NonNull String name) {
return new Builder<>(name);
return builder(name);
}
/**
@ -80,7 +96,7 @@ public final class DoubleArgument<C> extends CommandArgument<C, Double> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Double> of(final @NonNull String name) {
return DoubleArgument.<C>newBuilder(name).asRequired().build();
return DoubleArgument.<C>builder(name).asRequired().build();
}
/**
@ -91,7 +107,7 @@ public final class DoubleArgument<C> extends CommandArgument<C, Double> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Double> optional(final @NonNull String name) {
return DoubleArgument.<C>newBuilder(name).asOptional().build();
return DoubleArgument.<C>builder(name).asOptional().build();
}
/**
@ -106,7 +122,7 @@ public final class DoubleArgument<C> extends CommandArgument<C, Double> {
final @NonNull String name,
final double defaultNum
) {
return DoubleArgument.<C>newBuilder(name).asOptionalWithDefault(defaultNum).build();
return DoubleArgument.<C>builder(name).asOptionalWithDefault(defaultNum).build();
}
/**

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

@ -65,19 +65,40 @@ public class EnumArgument<C, E extends Enum<E>> extends CommandArgument<C, E> {
}
/**
* Create a new builder
* Create a new {@link Builder}.
*
* @param name Name of the argument
* @param enumClass Enum class
* @param <C> Command sender type
* @param <E> Enum type
* @return Created builder
* @param enumClass enum class
* @param name argument name
* @param <C> sender type
* @param <E> enum type
* @return new {@link Builder}
* @since 1.8.0
*/
public static <C, E extends Enum<E>> EnumArgument.@NonNull Builder<C, E> newBuilder(
@API(status = API.Status.STABLE, since = "1.8.0")
public static <C, E extends Enum<E>> @NonNull Builder<C, E> builder(
final @NonNull Class<E> enumClass,
final @NonNull String name
) {
return new EnumArgument.Builder<>(name, enumClass);
return new Builder<>(name, enumClass);
}
/**
* Create a new builder
*
* @param enumClass enum class
* @param name Name of the argument
* @param <C> Command sender type
* @param <E> enum type
* @return Created builder
* @deprecated prefer {@link #builder(Class, String)}
*/
@API(status = API.Status.DEPRECATED, since = "1.8.0")
@Deprecated
public static <C, E extends Enum<E>> @NonNull Builder<C, E> newBuilder(
final @NonNull Class<E> enumClass,
final @NonNull String name
) {
return builder(enumClass, name);
}
/**
@ -93,7 +114,7 @@ public class EnumArgument<C, E extends Enum<E>> extends CommandArgument<C, E> {
final @NonNull Class<E> enumClass,
final @NonNull String name
) {
return EnumArgument.<C, E>newBuilder(enumClass, name).asRequired().build();
return EnumArgument.<C, E>builder(enumClass, name).asRequired().build();
}
/**
@ -109,7 +130,7 @@ public class EnumArgument<C, E extends Enum<E>> extends CommandArgument<C, E> {
final @NonNull Class<E> enumClass,
final @NonNull String name
) {
return EnumArgument.<C, E>newBuilder(enumClass, name).asOptional().build();
return EnumArgument.<C, E>builder(enumClass, name).asOptional().build();
}
/**
@ -127,7 +148,7 @@ public class EnumArgument<C, E extends Enum<E>> extends CommandArgument<C, E> {
final @NonNull String name,
final @NonNull E defaultValue
) {
return EnumArgument.<C, E>newBuilder(enumClass, name).asOptionalWithDefault(defaultValue.name().toLowerCase()).build();
return EnumArgument.<C, E>builder(enumClass, name).asOptionalWithDefault(defaultValue.name().toLowerCase()).build();
}

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

@ -64,12 +64,28 @@ public final class FloatArgument<C> extends CommandArgument<C, Float> {
/**
* Create a new {@link Builder}.
*
* @param name argument name
* @param <C> sender type
* @return new {@link Builder}
* @since 1.8.0
*/
@API(status = API.Status.STABLE, since = "1.8.0")
public static <C> @NonNull Builder<C> builder(final @NonNull String name) {
return new Builder<>(name);
}
/**
* Create a new builder
*
* @param name Name of the argument
* @param <C> Command sender type
* @return Created builder
* @deprecated prefer {@link #builder(String)}
*/
@API(status = API.Status.DEPRECATED, since = "1.8.0")
@Deprecated
public static <C> @NonNull Builder<C> newBuilder(final @NonNull String name) {
return new Builder<>(name);
return builder(name);
}
/**
@ -80,7 +96,7 @@ public final class FloatArgument<C> extends CommandArgument<C, Float> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Float> of(final @NonNull String name) {
return FloatArgument.<C>newBuilder(name).asRequired().build();
return FloatArgument.<C>builder(name).asRequired().build();
}
/**
@ -91,7 +107,7 @@ public final class FloatArgument<C> extends CommandArgument<C, Float> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Float> optional(final @NonNull String name) {
return FloatArgument.<C>newBuilder(name).asOptional().build();
return FloatArgument.<C>builder(name).asOptional().build();
}
/**
@ -106,7 +122,7 @@ public final class FloatArgument<C> extends CommandArgument<C, Float> {
final @NonNull String name,
final float defaultNum
) {
return FloatArgument.<C>newBuilder(name).asOptionalWithDefault(defaultNum).build();
return FloatArgument.<C>builder(name).asOptionalWithDefault(defaultNum).build();
}
/**

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

@ -79,12 +79,28 @@ public final class IntegerArgument<C> extends CommandArgument<C, Integer> {
/**
* Create a new {@link Builder}.
*
* @param name argument name
* @param <C> sender type
* @return new {@link Builder}
* @since 1.8.0
*/
@API(status = API.Status.STABLE, since = "1.8.0")
public static <C> @NonNull Builder<C> builder(final @NonNull String name) {
return new Builder<>(name);
}
/**
* Create a new builder
*
* @param name Name of the argument
* @param <C> Command sender type
* @return Created builder
* @deprecated prefer {@link #builder(String)}
*/
@API(status = API.Status.DEPRECATED, since = "1.8.0")
@Deprecated
public static <C> @NonNull Builder<C> newBuilder(final @NonNull String name) {
return new Builder<>(name);
return builder(name);
}
/**
@ -95,7 +111,7 @@ public final class IntegerArgument<C> extends CommandArgument<C, Integer> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Integer> of(final @NonNull String name) {
return IntegerArgument.<C>newBuilder(name).asRequired().build();
return IntegerArgument.<C>builder(name).asRequired().build();
}
/**
@ -106,7 +122,7 @@ public final class IntegerArgument<C> extends CommandArgument<C, Integer> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Integer> optional(final @NonNull String name) {
return IntegerArgument.<C>newBuilder(name).asOptional().build();
return IntegerArgument.<C>builder(name).asOptional().build();
}
/**
@ -118,7 +134,7 @@ public final class IntegerArgument<C> extends CommandArgument<C, Integer> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Integer> optional(final @NonNull String name, final int defaultNum) {
return IntegerArgument.<C>newBuilder(name).asOptionalWithDefault(defaultNum).build();
return IntegerArgument.<C>builder(name).asOptionalWithDefault(defaultNum).build();
}
/**

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

@ -64,12 +64,28 @@ public final class LongArgument<C> extends CommandArgument<C, Long> {
/**
* Create a new {@link Builder}.
*
* @param name argument name
* @param <C> sender type
* @return new {@link Builder}
* @since 1.8.0
*/
@API(status = API.Status.STABLE, since = "1.8.0")
public static <C> @NonNull Builder<C> builder(final @NonNull String name) {
return new Builder<>(name);
}
/**
* Create a new builder
*
* @param name Name of the argument
* @param <C> Command sender type
* @return Created builder
* @deprecated prefer {@link #builder(String)}
*/
public static <C> LongArgument.@NonNull Builder<C> newBuilder(final @NonNull String name) {
return new Builder<>(name);
@API(status = API.Status.DEPRECATED, since = "1.8.0")
@Deprecated
public static <C> @NonNull Builder<C> newBuilder(final @NonNull String name) {
return builder(name);
}
/**
@ -80,7 +96,7 @@ public final class LongArgument<C> extends CommandArgument<C, Long> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Long> of(final @NonNull String name) {
return LongArgument.<C>newBuilder(name).asRequired().build();
return LongArgument.<C>builder(name).asRequired().build();
}
/**
@ -91,7 +107,7 @@ public final class LongArgument<C> extends CommandArgument<C, Long> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Long> optional(final @NonNull String name) {
return LongArgument.<C>newBuilder(name).asOptional().build();
return LongArgument.<C>builder(name).asOptional().build();
}
/**
@ -106,7 +122,7 @@ public final class LongArgument<C> extends CommandArgument<C, Long> {
final @NonNull String name,
final long defaultNum
) {
return LongArgument.<C>newBuilder(name).asOptionalWithDefault(defaultNum).build();
return LongArgument.<C>builder(name).asOptionalWithDefault(defaultNum).build();
}
/**

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

@ -64,12 +64,28 @@ public final class ShortArgument<C> extends CommandArgument<C, Short> {
/**
* Create a new {@link Builder}.
*
* @param name argument name
* @param <C> sender type
* @return new {@link Builder}
* @since 1.8.0
*/
@API(status = API.Status.STABLE, since = "1.8.0")
public static <C> @NonNull Builder<C> builder(final @NonNull String name) {
return new Builder<>(name);
}
/**
* Create a new builder
*
* @param name Name of the argument
* @param <C> Command sender type
* @return Created builder
* @deprecated prefer {@link #builder(String)}
*/
public static <C> ShortArgument.@NonNull Builder<C> newBuilder(final @NonNull String name) {
return new Builder<>(name);
@API(status = API.Status.DEPRECATED, since = "1.8.0")
@Deprecated
public static <C> @NonNull Builder<C> newBuilder(final @NonNull String name) {
return builder(name);
}
/**
@ -80,7 +96,7 @@ public final class ShortArgument<C> extends CommandArgument<C, Short> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Short> of(final @NonNull String name) {
return ShortArgument.<C>newBuilder(name).asRequired().build();
return ShortArgument.<C>builder(name).asRequired().build();
}
/**
@ -91,7 +107,7 @@ public final class ShortArgument<C> extends CommandArgument<C, Short> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Short> optional(final @NonNull String name) {
return ShortArgument.<C>newBuilder(name).asOptional().build();
return ShortArgument.<C>builder(name).asOptional().build();
}
/**
@ -103,7 +119,7 @@ public final class ShortArgument<C> extends CommandArgument<C, Short> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, Short> optional(final @NonNull String name, final short defaultNum) {
return ShortArgument.<C>newBuilder(name).asOptionalWithDefault(defaultNum).build();
return ShortArgument.<C>builder(name).asOptionalWithDefault(defaultNum).build();
}
/**

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

@ -68,15 +68,31 @@ public final class StringArgument<C> extends CommandArgument<C, String> {
this.stringMode = stringMode;
}
/**
* Create a new {@link Builder}.
*
* @param name argument name
* @param <C> sender type
* @return new {@link Builder}
* @since 1.8.0
*/
@API(status = API.Status.STABLE, since = "1.8.0")
public static <C> @NonNull Builder<C> builder(final @NonNull String name) {
return new Builder<>(name);
}
/**
* Create a new builder
*
* @param name Name of the argument
* @param <C> Command sender type
* @return Created builder
* @deprecated prefer {@link #builder(String)}
*/
public static <C> StringArgument.@NonNull Builder<C> newBuilder(final @NonNull String name) {
return new StringArgument.Builder<>(name);
@API(status = API.Status.DEPRECATED, since = "1.8.0")
@Deprecated
public static <C> @NonNull Builder<C> newBuilder(final @NonNull String name) {
return builder(name);
}
/**
@ -87,7 +103,7 @@ public final class StringArgument<C> extends CommandArgument<C, String> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, String> of(final @NonNull String name) {
return StringArgument.<C>newBuilder(name).single().asRequired().build();
return StringArgument.<C>builder(name).single().asRequired().build();
}
/**
@ -102,7 +118,7 @@ public final class StringArgument<C> extends CommandArgument<C, String> {
final @NonNull String name,
final @NonNull StringMode stringMode
) {
return StringArgument.<C>newBuilder(name).withMode(stringMode).asRequired().build();
return StringArgument.<C>builder(name).withMode(stringMode).asRequired().build();
}
/**
@ -113,7 +129,7 @@ public final class StringArgument<C> extends CommandArgument<C, String> {
* @return Created argument
*/
public static <C> @NonNull CommandArgument<C, String> optional(final @NonNull String name) {
return StringArgument.<C>newBuilder(name).single().asOptional().build();
return StringArgument.<C>builder(name).single().asOptional().build();
}
/**
@ -128,7 +144,7 @@ public final class StringArgument<C> extends CommandArgument<C, String> {
final @NonNull String name,
final @NonNull StringMode stringMode
) {
return StringArgument.<C>newBuilder(name).withMode(stringMode).asOptional().build();
return StringArgument.<C>builder(name).withMode(stringMode).asOptional().build();
}
/**
@ -143,7 +159,7 @@ public final class StringArgument<C> extends CommandArgument<C, String> {
final @NonNull String name,
final @NonNull String defaultString
) {
return StringArgument.<C>newBuilder(name).asOptionalWithDefault(defaultString).build();
return StringArgument.<C>builder(name).asOptionalWithDefault(defaultString).build();
}
/**

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

@ -56,15 +56,31 @@ public final class UUIDArgument<C> extends CommandArgument<C, UUID> {
super(required, name, new UUIDParser<>(), defaultValue, UUID.class, suggestionsProvider, defaultDescription);
}
/**
* Create a new {@link Builder}.
*
* @param name argument name
* @param <C> sender type
* @return new {@link Builder}
* @since 1.8.0
*/
@API(status = API.Status.STABLE, since = "1.8.0")
public static <C> @NonNull Builder<C> builder(final @NonNull String name) {
return new Builder<>(name);
}
/**
* Create a new builder
*
* @param name Name of the component
* @param name Name of the argument
* @param <C> Command sender type
* @return Created builder
* @deprecated prefer {@link #builder(String)}
*/
@API(status = API.Status.DEPRECATED, since = "1.8.0")
@Deprecated
public static <C> @NonNull Builder<C> newBuilder(final @NonNull String name) {
return new Builder<>(name);
return builder(name);
}
/**
@ -75,7 +91,7 @@ public final class UUIDArgument<C> extends CommandArgument<C, UUID> {
* @return Created component
*/
public static <C> @NonNull CommandArgument<C, UUID> of(final @NonNull String name) {
return UUIDArgument.<C>newBuilder(name).asRequired().build();
return UUIDArgument.<C>builder(name).asRequired().build();
}
/**
@ -86,7 +102,7 @@ public final class UUIDArgument<C> extends CommandArgument<C, UUID> {
* @return Created component
*/
public static <C> @NonNull CommandArgument<C, UUID> optional(final @NonNull String name) {
return UUIDArgument.<C>newBuilder(name).asOptional().build();
return UUIDArgument.<C>builder(name).asOptional().build();
}
/**
@ -101,7 +117,7 @@ public final class UUIDArgument<C> extends CommandArgument<C, UUID> {
final @NonNull String name,
final @NonNull UUID defaultUUID
) {
return UUIDArgument.<C>newBuilder(name).asOptionalWithDefault(defaultUUID.toString()).build();
return UUIDArgument.<C>builder(name).asOptionalWithDefault(defaultUUID.toString()).build();
}

15
cloud-core/src/main/java/cloud/commandframework/execution/AsynchronousCommandExecutionCoordinator.java
View file

@ -64,12 +64,27 @@ public final class AsynchronousCommandExecutionCoordinator<C> extends CommandExe
this.commandManager = commandTree.getCommandManager();
}
/**
* Create a new {@link Builder} instance.
*
* @param <C> sender type
* @return new {@link Builder}
* @since 1.8.0
*/
@API(status = API.Status.STABLE, since = "1.8.0")
public static <C> @NonNull Builder<C> builder() {
return new Builder<>();
}
/**
* Create a new {@link Builder} instance
*
* @param <C> Command sender type
* @return Builder
* @deprecated prefer {@link #builder()}
*/
@API(status = API.Status.DEPRECATED, since = "1.8.0")
@Deprecated
public static <C> @NonNull Builder<C> newBuilder() {
return new Builder<>();
}

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

@ -53,18 +53,18 @@ public class CommandSuggestionsTest {
manager.command(manager.commandBuilder("test").literal("two").build());
manager.command(manager.commandBuilder("test")
.literal("var")
.argument(StringArgument.<TestCommandSender>newBuilder("str")
.argument(StringArgument.<TestCommandSender>builder("str")
.withSuggestionsProvider((c, s) -> Arrays.asList("one", "two")))
.argument(EnumArgument.of(TestEnum.class, "enum")));
manager.command(manager.commandBuilder("test")
.literal("comb")
.argument(StringArgument.<TestCommandSender>newBuilder("str")
.argument(StringArgument.<TestCommandSender>builder("str")
.withSuggestionsProvider((c, s) -> Arrays.asList("one", "two")))
.argument(IntegerArgument.<TestCommandSender>newBuilder("num")
.argument(IntegerArgument.<TestCommandSender>builder("num")
.withMin(1).withMax(95).asOptional()));
manager.command(manager.commandBuilder("test")
.literal("alt")
.argument(IntegerArgument.<TestCommandSender>newBuilder("num")
.argument(IntegerArgument.<TestCommandSender>builder("num")
.withSuggestionsProvider((c, s) -> Arrays.asList("3", "33", "333"))));
manager.command(manager.commandBuilder("com")
@ -110,11 +110,11 @@ public class CommandSuggestionsTest {
manager.command(manager.commandBuilder("numberswithfollowingargument").argument(IntegerArgument.of("num"))
.argument(BooleanArgument.of("another_argument")));
manager.command(manager.commandBuilder("numberswithmin")
.argument(IntegerArgument.<TestCommandSender>newBuilder("num").withMin(5).withMax(100)));
.argument(IntegerArgument.<TestCommandSender>builder("num").withMin(5).withMax(100)));
manager.command(manager.commandBuilder("partial")
.argument(
StringArgument.<TestCommandSender>newBuilder("arg")
StringArgument.<TestCommandSender>builder("arg")
.withSuggestionsProvider((contect, input) -> Arrays.asList("hi", "hey", "heya", "hai", "hello"))
)
.literal("literal")
@ -122,7 +122,7 @@ public class CommandSuggestionsTest {
manager.command(manager.commandBuilder("literal_with_variable")
.argument(
StringArgument.<TestCommandSender>newBuilder("arg")
StringArgument.<TestCommandSender>builder("arg")
.withSuggestionsProvider((context, input) -> Arrays.asList("veni", "vidi")).build()
)
.literal("now"));
@ -453,7 +453,7 @@ public class CommandSuggestionsTest {
manager.command(
manager.commandBuilder("command")
.argument(
StringArgument.<TestCommandSender>newBuilder("string")
StringArgument.<TestCommandSender>builder("string")
.greedyFlagYielding()
.withSuggestionsProvider((context, input) -> Collections.singletonList("hello"))
.build()
@ -520,7 +520,7 @@ public class CommandSuggestionsTest {
manager.command(
manager.commandBuilder("command")
.argument(
StringArgument.<TestCommandSender>newBuilder("string")
StringArgument.<TestCommandSender>builder("string")
.greedyFlagYielding()
.withSuggestionsProvider((context, input) -> Collections.singletonList("hello"))
.build()

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

@ -47,7 +47,7 @@ class Issue281 {
void commandExceptionShouldNotBeSwallowed() {
// Arrange
final CommandManager<TestCommandSender> commandManager = new CommandManager<TestCommandSender>(
AsynchronousCommandExecutionCoordinator.<TestCommandSender>newBuilder().withSynchronousParsing().build(),
AsynchronousCommandExecutionCoordinator.<TestCommandSender>builder().withSynchronousParsing().build(),
CommandRegistrationHandler.nullCommandRegistrationHandler()
) {
@Override