diff --git a/spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/CommandCatalogAutoConfiguration.java b/spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/CommandCatalogAutoConfiguration.java index fbef81996..d38620b10 100644 --- a/spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/CommandCatalogAutoConfiguration.java +++ b/spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/CommandCatalogAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.shell.command.CommandRegistration.OptionNameModifier; import org.springframework.shell.command.support.OptionNameModifierSupport; import org.springframework.shell.command.CommandResolver; +import org.springframework.shell.context.ShellContext; @AutoConfiguration @EnableConfigurationProperties(SpringShellProperties.class) @@ -43,9 +44,10 @@ public class CommandCatalogAutoConfiguration { @ConditionalOnMissingBean(CommandCatalog.class) public CommandCatalog commandCatalog(ObjectProvider methodTargetRegistrars, ObjectProvider commandResolvers, - ObjectProvider commandCatalogCustomizers) { + ObjectProvider commandCatalogCustomizers, + ShellContext shellContext) { List 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); }); diff --git a/spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/CommandCatalogAutoConfigurationTests.java b/spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/CommandCatalogAutoConfigurationTests.java index dd7bdb240..61a05d2b5 100644 --- a/spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/CommandCatalogAutoConfigurationTests.java +++ b/spring-shell-autoconfigure/src/test/java/org/springframework/shell/boot/CommandCatalogAutoConfigurationTests.java @@ -36,7 +36,7 @@ public class CommandCatalogAutoConfigurationTests { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(CommandCatalogAutoConfiguration.class)); + .withConfiguration(AutoConfigurations.of(CommandCatalogAutoConfiguration.class, ShellContextAutoConfiguration.class)); @Test void defaultCommandCatalog() {