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

Add HandlerMethodArgumentResolver for @Option

Browse Source 
- New OptionMethodArgumentResolver which is similar
  than ShellOptionMethodArgumentResolver for @ShellOption.
- Add missing annotation commands for e2e test command.
- Fixes #767
This commit is contained in:
Janne Valkealahti
2023-06-07 15:28:57 +01:00
parent afacf86ac5
commit 042d56e7e3
3 changed files with 114 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spring-shell-samples/src/main/java/org/springframework/shell/samples/e2e/OptionNamingCommands.java
View File

@@ -17,6 +17,8 @@ package org.springframework.shell.samples.e2e;
import org.springframework.context.annotation.Bean;
import org.springframework.shell.command.CommandRegistration;
import org.springframework.shell.command.annotation.Command;
import org.springframework.shell.command.annotation.Option;
import org.springframework.shell.standard.ShellComponent;
import org.springframework.shell.standard.ShellMethod;
import org.springframework.shell.standard.ShellOption;
@@ -28,12 +30,28 @@ public class OptionNamingCommands {
public static class LegacyAnnotation extends BaseE2ECommands {
@ShellMethod(key = LEGACY_ANNO + "option-naming-1", group = GROUP)
public void testOptionNaming1Annotation(
public String testOptionNaming1Annotation(
@ShellOption("from_snake") String snake,
@ShellOption("fromCamel") String camel,
@ShellOption("from-kebab") String kebab,
@ShellOption("FromPascal") String pascal
) {
return String.format("snake='%s' camel='%s' kebab='%s' pascal='%s' ", snake, camel, kebab, pascal);
}
}
@Command(command = BaseE2ECommands.ANNO, group = BaseE2ECommands.GROUP)
public static class Annotation extends BaseE2ECommands {
@Command(command = "option-naming-1")
public String testOptionNaming1Annotation(
@Option(longNames = "from_snake") String snake,
@Option(longNames = "fromCamel") String camel,
@Option(longNames = "from-kebab") String kebab,
@Option(longNames = "FromPascal") String pascal
) {
return String.format("snake='%s' camel='%s' kebab='%s' pascal='%s' ", snake, camel, kebab, pascal);
}
}
@@ -65,10 +83,16 @@ public class OptionNamingCommands {
.withOption()
.longNames("arg1")
.nameModifier(name -> "x" + name)
.required()
// .required()
.and()
.withTarget()
.consumer(ctx -> {})
.function(ctx -> {
String snake = ctx.getOptionValue("from_snake");
String camel = ctx.getOptionValue("fromCamel");
String kebab = ctx.getOptionValue("from-kebab");
String pascal = ctx.getOptionValue("FromPascal");
return String.format("snake='%s' camel='%s' kebab='%s' pascal='%s' ", snake, camel, kebab, pascal);
})
.and()
.build();
}