Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Made parent Optional in CompositeCommand to avoid null checks.

This commit is contained in:
Tastybento 2017-12-23 21:58:32 -08:00
parent 00b71c6090
commit 9b5a7c887c
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/us/tastybento/bskyblock/api/commands/CompositeCommand.java
View File

@ -6,6 +6,7 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
@ -38,9 +39,9 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
*/
private boolean onlyPlayer = false;
/**
* The parent command to this one. If this is a top-level command it will be null.
* The parent command to this one. If this is a top-level command it will be empty.
*/
private final CompositeCommand parent;
private final Optional<CompositeCommand> parent;
/**
* The permission required to execute this command
*/
@ -64,7 +65,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
*/
public CompositeCommand(CompositeCommand parent, String label, String... aliases) {
super(label);
this.parent = parent;
this.parent = Optional.of(parent);
this.subCommandLevel = parent.getLevel() + 1;
// Add this sub-command to the parent
parent.getSubCommands().put(label, this);
@ -82,12 +83,12 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
/**
* This is the top-level command constructor for commands that have no parent.
* @param label - string for this command
* @param aliases - aliases for this command
* @param string - aliases for this command
*/
public CompositeCommand(String label, String... aliases) {
public CompositeCommand(String label, String... string) {
super(label);
this.setAliases(new ArrayList<>(Arrays.asList(aliases)));
this.parent = null;
this.setAliases(new ArrayList<>(Arrays.asList(string)));
this.parent = Optional.empty();
setUsage("");
this.subCommandLevel = 0; // Top level
this.subCommands = new LinkedHashMap<>();
@ -201,7 +202,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
/**
* @return the parent command object
*/
public CompositeCommand getParent() {
public Optional<CompositeCommand> getParent() {
return parent;
}
@ -261,11 +262,11 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
@Override
public Command setUsage(String usage) {
// Go up the chain
CompositeCommand parent = this.getParent();
Optional<CompositeCommand> parent = this.getParent();
this.usage = this.getLabel() + " " + usage;
while (parent != null) {
this.usage = parent.getLabel() + " " + this.usage;
parent = parent.getParent();
while (parent.isPresent()) {
this.usage = parent.get().getLabel() + " " + this.usage;
parent = parent.get().getParent();
}
this.usage = "/" + this.usage;
this.usage = this.usage.trim();

2
src/test/java/bskyblock/TestIslandCommand.java
View File

@ -85,7 +85,7 @@ public class TestIslandCommand {
assertEquals(2, testCommand.getAliases().size());
assertEquals("t", testCommand.getAliases().get(0));
assertTrue(testCommand.isOnlyPlayer());
assertNull(testCommand.getParent());
assertEquals(testCommand.getParent(), Optional.empty());
assertEquals(Settings.PERMPREFIX + "default.permission", testCommand.getPermission());
// Check commands and aliases match to correct class
for (Entry<String, CompositeCommand> command : testCommand.getSubCommands().entrySet()) {