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

Pass ShellContext to CommandCatalog.of in CommandCatalogAutoConfiguration (#693)

Browse Source 
- Backport #702
- Fixes #703
This commit is contained in:
cachescrubber
2023-04-06 10:08:09 +02:00
committed by Janne Valkealahti
parent 78faeac86a
commit f3e3061580
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/CommandCatalogAutoConfiguration.java
View File

@@ -27,6 +27,7 @@ import org.springframework.shell.command.CommandCatalog;
import org.springframework.shell.command.CommandCatalogCustomizer;
import org.springframework.shell.command.CommandRegistration;
import org.springframework.shell.command.CommandResolver;
import org.springframework.shell.context.ShellContext;
@Configuration(proxyBeanMethods = false)
public class CommandCatalogAutoConfiguration {
@@ -35,9 +36,10 @@ public class CommandCatalogAutoConfiguration {
@ConditionalOnMissingBean(CommandCatalog.class)
public CommandCatalog commandCatalog(ObjectProvider<MethodTargetRegistrar> methodTargetRegistrars,
ObjectProvider<CommandResolver> commandResolvers,
ObjectProvider<CommandCatalogCustomizer> commandCatalogCustomizers) {
ObjectProvider<CommandCatalogCustomizer> commandCatalogCustomizers,
ShellContext shellContext) {
List<CommandResolver> resolvers = commandResolvers.orderedStream().collect(Collectors.toList());
CommandCatalog catalog = CommandCatalog.of(resolvers, null);
CommandCatalog catalog = CommandCatalog.of(resolvers, shellContext);
methodTargetRegistrars.orderedStream().forEach(resolver -> {
resolver.register(catalog);
});

2
spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/CommandCatalogAutoConfigurationTests.java
View File

@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class CommandCatalogAutoConfigurationTests {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(CommandCatalogAutoConfiguration.class));
.withConfiguration(AutoConfigurations.of(CommandCatalogAutoConfiguration.class, ShellContextAutoConfiguration.class));
@Test
void defaultCommandCatalog() {