Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-12-23 17:17:36 +01:00
Code Issues Projects Releases Wiki Activity

Use Guava for CommandDescription builder validation

Browse Source
This commit is contained in:
ljacqu 2015-12-12 22:28:05 +01:00
parent 4d8d9de733
commit d26cbfbd14
1 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/fr/xephi/authme/command/CommandDescription.java
View File

@ -2,13 +2,13 @@ package fr.xephi.authme.command;
import fr.xephi.authme.permission.DefaultPermission; import fr.xephi.authme.permission.DefaultPermission;
import fr.xephi.authme.permission.PermissionNode; import fr.xephi.authme.permission.PermissionNode;
import fr.xephi.authme.util.CollectionUtils;
import fr.xephi.authme.util.StringUtils; import fr.xephi.authme.util.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import static com.google.common.base.Objects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
/** /**
@ -220,15 +220,14 @@ public class CommandDescription {
* @return The generated CommandDescription object * @return The generated CommandDescription object
*/ */
public CommandDescription build() { public CommandDescription build() {
return createInstance( checkArgument(!CollectionUtils.isEmpty(labels), "Labels may not be empty");
getOrThrow(labels, "labels"), checkArgument(!StringUtils.isEmpty(description), "Description may not be empty");
firstNonNull(description, ""), checkArgument(!StringUtils.isEmpty(detailedDescription), "Detailed description may not be empty");
firstNonNull(detailedDescription, ""), checkArgument(executableCommand != null, "Executable command must be set");
getOrThrow(executableCommand, "executableCommand"), // parents and permissions may be null; arguments may be empty
firstNonNull(parent, null),
arguments, return createInstance(labels, description, detailedDescription, executableCommand,
permissions parent, arguments, permissions);
);
} }
public CommandBuilder labels(List<String> labels) { public CommandBuilder labels(List<String> labels) {
@ -277,33 +276,9 @@ public class CommandDescription {
public CommandBuilder permissions(DefaultPermission defaultPermission, public CommandBuilder permissions(DefaultPermission defaultPermission,
PermissionNode... permissionNodes) { PermissionNode... permissionNodes) {
this.permissions = new CommandPermissions(asMutableList(permissionNodes), defaultPermission); this.permissions = new CommandPermissions(asList(permissionNodes), defaultPermission);
return this; return this;
} }
@SafeVarargs
private static <T> List<T> asMutableList(T... items) {
return new ArrayList<>(asList(items));
}
private static <T> T getOrThrow(T element, String elementName) {
if (!isEmpty(element)) {
return element;
}
throw new RuntimeException("The element '" + elementName + "' may not be empty in CommandDescription");
}
private static <T> boolean isEmpty(T element) {
if (element == null) {
return true;
} else if (element instanceof Collection<?>) {
return ((Collection<?>) element).isEmpty();
} else if (element instanceof String) {
return StringUtils.isEmpty((String) element);
}
return false;
}
} }
} }