Skip to content

Added JLine NonInteractiveShellRunner configuration #1312 #1319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
czpilar wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −0
Open

Added JLine NonInteractiveShellRunner configuration #1312 #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions ...c/main/java/org/springframework/shell/core/autoconfigure/JLineShellAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.springframework.context.event.ContextClosedEvent;
import org.springframework.context.event.EventListener;
import org.springframework.core.env.Environment;
import org.springframework.shell.core.NonInteractiveShellRunner;
import org.springframework.shell.core.ShellRunner;
import org.springframework.shell.core.command.Command;
import org.springframework.shell.core.command.CommandParser;
Expand All @@ -67,6 +68,7 @@
* @author Florent Biville
* @author Mahmoud Ben Hassine
* @author Piotr Olaszewski
* @author David Pilar
*/
@AutoConfiguration
@EnableConfigurationProperties(SpringShellProperties.class)
Expand Down Expand Up @@ -109,6 +111,13 @@ public ShellRunner jlineShellRunner(JLineInputProvider inputProvider, CommandPar
return jLineShellRunner;
}

@Bean
@ConditionalOnProperty(prefix = "spring.shell.interactive", name = "enabled", havingValue = "false")
public ShellRunner jlineNonInteractiveShellRunner(CommandParser commandParser, CommandRegistry commandRegistry,
Terminal terminal) {
return new NonInteractiveShellRunner(commandParser, commandRegistry, terminal.writer());
}

@Bean
public LineReader lineReader(Terminal terminal, Parser parser, CommandCompleter commandCompleter,
CommandHighlighter commandHighlighter) {
Expand Down
1 change: 1 addition & 0 deletions .../main/java/org/springframework/shell/core/autoconfigure/ShellRunnerAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public ShellRunner systemShellRunner(ConsoleInputProvider consoleInputProvider,
}

@Bean
@ConditionalOnMissingClass("org.springframework.shell.jline.DefaultJLineShellConfiguration")
@ConditionalOnProperty(prefix = "spring.shell.interactive", name = "enabled", havingValue = "false")
public ShellRunner nonInteractiveShellRunner(CommandParser commandParser, CommandRegistry commandRegistry) {
return new NonInteractiveShellRunner(commandParser, commandRegistry);
Expand Down