Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ public static class NonePrimaryCommandConfiguration {

@Bean
@ConditionalOnProperty(prefix = "spring.shell.interactive", value = "enabled", havingValue = "true",
matchIfMissing = false)
matchIfMissing = true)
public InteractiveShellRunner interactiveApplicationRunner(LineReader lineReader, PromptProvider promptProvider,
Shell shell, ShellContext shellContext) {
return new InteractiveShellRunner(lineReader, promptProvider, shell, shellContext);
}

@Bean
@ConditionalOnProperty(prefix = "spring.shell.noninteractive", value = "enabled", havingValue = "true",
matchIfMissing = true)
matchIfMissing = false)
public NonInteractiveShellRunner nonInteractiveApplicationRunner(Shell shell, ShellContext shellContext,
ObjectProvider<NonInteractiveShellRunnerCustomizer> customizer) {
NonInteractiveShellRunner shellRunner = new NonInteractiveShellRunner(shell, shellContext);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ class ShellRunnerAutoConfigurationTests {
class Interactive {

@Test
void disabledByDefault() {
contextRunner.run(context -> assertThat(context).doesNotHaveBean(InteractiveShellRunner.class));
void enabledByDefault() {
contextRunner.run(context -> assertThat(context).hasSingleBean(InteractiveShellRunner.class));
}

@Test
Expand All @@ -71,21 +71,21 @@ void disabledWhenPropertySet() {
@Nested
class NonInteractive {

@Test
void enabledByDefault() {
contextRunner.run(context -> assertThat(context).hasSingleBean(NonInteractiveShellRunner.class));
}

@Test
void primaryCommandNotSet() {
contextRunner.run(context -> {
contextRunner.withPropertyValues("spring.shell.noninteractive.enabled:true").run(context -> {
assertThat(context).hasSingleBean(NonInteractiveShellRunner.class);
NonInteractiveShellRunner runner = context.getBean(NonInteractiveShellRunner.class);
String command = (String) ReflectionTestUtils.getField(runner, "primaryCommand");
assertThat(command).isNull();
});
}

@Test
void disabledByDefault() {
contextRunner.run(context -> assertThat(context).doesNotHaveBean(NonInteractiveShellRunner.class));
}

@Test
void disabledWhenPropertySet() {
contextRunner.withPropertyValues("spring.shell.noninteractive.enabled:false")
Expand All @@ -95,10 +95,12 @@ void disabledWhenPropertySet() {
@Test
void canBeCustomized() {
NonInteractiveShellRunnerCustomizer customizer = mock(NonInteractiveShellRunnerCustomizer.class);
contextRunner.withBean(NonInteractiveShellRunnerCustomizer.class, () -> customizer).run(context -> {
NonInteractiveShellRunner runner = context.getBean(NonInteractiveShellRunner.class);
verify(customizer).customize(runner);
});
contextRunner.withPropertyValues("spring.shell.noninteractive.enabled:true")
.withBean(NonInteractiveShellRunnerCustomizer.class, () -> customizer)
.run(context -> {
NonInteractiveShellRunner runner = context.getBean(NonInteractiveShellRunner.class);
verify(customizer).customize(runner);
});
}

}
Expand Down
Loading