Skip to content

Fix: the Script command now passes its output writer to each command executed within the script (#1270) #1275

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
Open

Fix: the Script command now passes its output writer to each command executed within the script (#1270) #1275

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
8 changes: 7 additions & 1 deletion ...ng-shell-core/src/main/java/org/springframework/shell/core/NonInteractiveShellRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class NonInteractiveShellRunner implements ShellRunner {
private final CommandRegistry commandRegistry;

// Use a no-op PrintWriter since output is not needed in non-interactive mode
private final PrintWriter outputWriter = new PrintWriter(PrintWriter.nullWriter());
private PrintWriter outputWriter = new PrintWriter(PrintWriter.nullWriter());

// Use a no-op InputReader since input is not needed in non-interactive mode
private final InputReader inputReader = new InputReader() {
Expand All @@ -66,6 +66,12 @@ public NonInteractiveShellRunner(CommandParser commandParser, CommandRegistry co
this.commandExecutor = new CommandExecutor(commandRegistry);
}

public NonInteractiveShellRunner(CommandParser commandParser, CommandRegistry commandRegistry,
PrintWriter outputWriter) {
this(commandParser, commandRegistry);
this.outputWriter = outputWriter;
}

@Override
public void run(String[] args) throws Exception {
if (ObjectUtils.isEmpty(args)) {
Expand Down
2 changes: 1 addition & 1 deletion spring-shell-core/src/main/java/org/springframework/shell/core/command/Script.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public ExitStatus execute(CommandContext commandContext) throws Exception {
private void executeCommand(CommandContext commandContext, String input) throws Exception {
String[] commandTokens = input.split(" ");
NonInteractiveShellRunner shellRunner = new NonInteractiveShellRunner(this.commandParser,
commandContext.commandRegistry());
commandContext.commandRegistry(), commandContext.outputWriter());
shellRunner.run(commandTokens);
}

Expand Down