Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Expose CommandRegistration in CommandContext

Browse Source 
- Fixes #420
This commit is contained in:
Janne Valkealahti
2022-05-18 08:18:38 +01:00
parent b119473881
commit c7d3eb15b4
4 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-shell-core/src/main/java/org/springframework/shell/command/CommandContext.java
View File

@@ -54,6 +54,13 @@ public interface CommandContext {
*/
CommandParserResults getParserResults();
/**
* Gets a command registration.
*
* @return the command registration
*/
CommandRegistration getCommandRegistration();
/**
* Gets an mapped option value.
*
@@ -76,10 +83,12 @@ public interface CommandContext {
* @param args the arguments
* @param results the results
* @param terminal the terminal
* @param commandRegistration the command registration
* @return a command context
*/
static CommandContext of(String[] args, CommandParserResults results, Terminal terminal) {
return new DefaultCommandContext(args, results, terminal);
static CommandContext of(String[] args, CommandParserResults results, Terminal terminal,
CommandRegistration commandRegistration) {
return new DefaultCommandContext(args, results, terminal, commandRegistration);
}
/**
@@ -87,14 +96,17 @@ public interface CommandContext {
*/
static class DefaultCommandContext implements CommandContext {
private String[] args;
private CommandParserResults results;
private Terminal terminal;
private final String[] args;
private final CommandParserResults results;
private final Terminal terminal;
private final CommandRegistration commandRegistration;
DefaultCommandContext(String[] args, CommandParserResults results, Terminal terminal) {
DefaultCommandContext(String[] args, CommandParserResults results, Terminal terminal,
CommandRegistration commandRegistration) {
this.args = args;
this.results = results;
this.terminal = terminal;
this.commandRegistration = commandRegistration;
}
@Override
@@ -112,6 +124,11 @@ public interface CommandContext {
return results;
}
@Override
public CommandRegistration getCommandRegistration() {
return commandRegistration;
}
@Override
@SuppressWarnings("unchecked")
public <T> T getOptionValue(String name) {

2
spring-shell-core/src/main/java/org/springframework/shell/command/CommandExecution.java
View File

@@ -104,7 +104,7 @@ public interface CommandExecution {
throw new CommandParserExceptionsException("Command parser resulted errors", results.errors());
}
CommandContext ctx = CommandContext.of(args, results, terminal);
CommandContext ctx = CommandContext.of(args, results, terminal, registration);
Object res = null;