Skip to content

Commit

Permalink
Refactoring command registers, step I
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattirn
mattirn committed Apr 18, 2020
1 parent a88409f commit 6dcb288
Show file tree
Hide file tree
Showing 6 changed files with 378 additions and 334 deletions.
223 changes: 217 additions & 6 deletions builtins/src/main/java/org/jline/builtins/AbstractCommandRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,35 @@
package org.jline.builtins;

import java.util.*;
import java.util.stream.Collectors;

import org.jline.console.ArgDesc;
import org.jline.console.CmdDesc;
import org.jline.console.CommandRegistry;
import org.jline.utils.AttributedString;

import org.jline.builtins.Options;
import org.jline.builtins.Builtins.Command;
import org.jline.builtins.Builtins.CommandInput;
import org.jline.builtins.Builtins.CommandMethods;
import org.jline.builtins.Completers.OptDesc;
import org.jline.builtins.Options.HelpException;
import org.jline.console.CommandRegistry.CommandSession;
import org.jline.reader.impl.completer.SystemCompleter;

public abstract class AbstractCommandRegistry {
private CmdRegistry cmdRegistry;
private Exception exception;

public AbstractCommandRegistry() {}

public <T extends Enum<T>> void registerCommands(Map<T,String> commandName, Map<T,CommandMethods> commandExecute) {
cmdRegistry = new EnumCmdRegistry<T>(commandName, commandExecute);
}

public void registerCommands(Map<String,CommandMethods> commandExecute) {
cmdRegistry = new StringCmdRegistry(commandExecute);
}

public List<String> commandInfo(String command) {
try {
Expand All @@ -38,10 +55,6 @@ public List<String> commandInfo(String command) {
+ this.getClass().getCanonicalName());
}

public Set<String> commandNames() {
return new HashSet<>();
}

public CmdDesc commandDescription(String command) {
try {
if (command != null && !command.isEmpty()) {
Expand All @@ -65,11 +78,27 @@ public CmdDesc commandDescription(String command) {
throw new IllegalArgumentException("default CommandRegistry.commandDescription() method must be overridden in class "
+ this.getClass().getCanonicalName());
}

public List<OptDesc> commandOptions(String command) {
try {
invoke(new CommandRegistry.CommandSession(), command, "--help");
} catch (HelpException e) {
return Builtins.compileCommandOptions(e.getMessage());
} catch (Exception e) {

public Object execute(CommandSession session, String command, String[] args) throws Exception {
throw new IllegalArgumentException("CommandRegistry method execute(String command, String[] args) is not implemented!");
}
return null;
}

public Object execute(CommandRegistry.CommandSession session, String command, String[] args) throws Exception {
exception = null;
getCommandMethods(command).execute().accept(new CommandInput(command, args, session));
if (exception != null) {
throw exception;
}
return null;
}

public Object invoke(CommandSession session, String command, Object... args) throws Exception {
String[] _args = new String[args.length];
for (int i = 0; i < args.length; i++) {
Expand All @@ -80,6 +109,10 @@ public Object invoke(CommandSession session, String command, Object... args) thr
}
return execute(session, command, _args);
}

public void saveException(Exception exception) {
this.exception = exception;
}

public Options parseOptions(String[] usage, Object[] args) throws HelpException {
Options opt = Options.compile(usage).parse(args);
Expand All @@ -89,4 +122,182 @@ public Options parseOptions(String[] usage, Object[] args) throws HelpException
return opt;
}

public boolean hasCommand(String command) {
return cmdRegistry.hasCommand(command);
}

public Set<String> commandNames() {
return cmdRegistry.commandNames();
}

public Map<String, String> commandAliases() {
return cmdRegistry.commandAliases();
}

public <V extends Enum<V>> void rename(V command, String newName) {
cmdRegistry.rename(command, newName);
}

public void alias(String alias, String command) {
cmdRegistry.alias(alias, command);
}

public SystemCompleter compileCompleters() {
return cmdRegistry.compileCompleters();
}

public CommandMethods getCommandMethods(String command) {
return cmdRegistry.getCommandMethods(command);
}

private interface CmdRegistry {
boolean hasCommand(String command);
Set<String> commandNames();
Map<String, String> commandAliases();
<V extends Enum<V>> void rename(V command, String newName);
void alias(String alias, String command);
SystemCompleter compileCompleters();
CommandMethods getCommandMethods(String command);
}

private static class EnumCmdRegistry<T extends Enum<T>> implements CmdRegistry {
private Map<T,String> commandName;
private Map<String,T> nameCommand = new HashMap<>();
private Map<T,CommandMethods> commandExecute;
private Map<String,String> aliasCommand = new HashMap<>();

public EnumCmdRegistry(Map<T,String> commandName, Map<T,CommandMethods> commandExecute) {
this.commandName = commandName;
this.commandExecute = commandExecute;
doNameCommand();
}

private void doNameCommand() {
nameCommand = commandName.entrySet()
.stream()
.collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
}

public Set<String> commandNames() {
return nameCommand.keySet();
}

public Map<String, String> commandAliases() {
return aliasCommand;
}

@SuppressWarnings("unchecked")
public <V extends Enum<V>> void rename(V command, String newName) {
if (nameCommand.containsKey(newName)) {
throw new IllegalArgumentException("Duplicate command name!");
} else if (!commandName.containsKey((T)command)) {
throw new IllegalArgumentException("Command does not exists!");
}
commandName.put((T)command, newName);
doNameCommand();
}

public void alias(String alias, String command) {
if (!nameCommand.keySet().contains(command)) {
throw new IllegalArgumentException("Command does not exists!");
}
aliasCommand.put(alias, command);
}

public boolean hasCommand(String name) {
if (nameCommand.containsKey(name) || aliasCommand.containsKey(name)) {
return true;
}
return false;
}

public SystemCompleter compileCompleters() {
SystemCompleter out = new SystemCompleter();
for (Map.Entry<T, String> entry: commandName.entrySet()) {
out.add(entry.getValue(), commandExecute.get(entry.getKey()).compileCompleter().apply(entry.getValue()));
}
out.addAliases(aliasCommand);
return out;
}

private T command(String name) {
T out = null;
if (!hasCommand(name)) {
throw new IllegalArgumentException("Command does not exists!");
}
if (aliasCommand.containsKey(name)) {
name = aliasCommand.get(name);
}
if (nameCommand.containsKey(name)) {
out = nameCommand.get(name);
} else {
throw new IllegalArgumentException("Command does not exists!");
}
return out;
}

public CommandMethods getCommandMethods(String command) {
return commandExecute.get(command(command));
}

}

private static class StringCmdRegistry implements CmdRegistry {
private Map<String,CommandMethods> commandExecute;
private Map<String,String> aliasCommand = new HashMap<>();

public StringCmdRegistry(Map<String,CommandMethods> commandExecute) {
this.commandExecute = commandExecute;
}

public Set<String> commandNames() {
return commandExecute.keySet();
}

public Map<String, String> commandAliases() {
return aliasCommand;
}

public <V extends Enum<V>> void rename(V command, String newName) {
throw new IllegalArgumentException();
}

public void alias(String alias, String command) {
if (!commandExecute.containsKey(command)) {
throw new IllegalArgumentException("Command does not exists!");
}
aliasCommand.put(alias, command);
}

public boolean hasCommand(String name) {
if (commandExecute.containsKey(name) || aliasCommand.containsKey(name)) {
return true;
}
return false;
}

public SystemCompleter compileCompleters() {
SystemCompleter out = new SystemCompleter();
for (String c : commandExecute.keySet()) {
out.add(c, commandExecute.get(c).compileCompleter().apply(c));
}
out.addAliases(aliasCommand);
return out;
}

private String command(String name) {
if (commandExecute.containsKey(name)) {
return name;
} else if (aliasCommand.containsKey(name)) {
return aliasCommand.get(name);
}
return null;
}

public CommandMethods getCommandMethods(String command) {
return commandExecute.get(command(command));
}

}

}

0 comments on commit 6dcb288

Please sign in to comment.