Skip to content

Fixed script command to accept the script file as an option #1301 #1302

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

Closed
czpilar wants to merge 1 commit into from
Closed

Fixed script command to accept the script file as an option #1301 #1302

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
19 changes: 12 additions & 7 deletions 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 @@ -17,6 +17,7 @@

import java.io.File;
import java.util.List;
import java.util.Objects;

import org.springframework.shell.core.FileInputProvider;
import org.springframework.shell.core.NonInteractiveShellRunner;
Expand All @@ -27,6 +28,7 @@
* @author Eric Bottard
* @author Janne Valkealahti
* @author Mahmoud Ben Hassine
* @author David Pilar
*/
public class Script implements Command {

Expand All @@ -44,13 +46,16 @@ public String getGroup() {

@Override
public ExitStatus execute(CommandContext commandContext) throws Exception {
List<CommandArgument> arguments = commandContext.parsedInput().arguments();
if (arguments.size() != 1) {
throw new IllegalArgumentException(
"Script command expects exactly one argument: the absolute path to the script file to execute.");
}
String scriptFile = arguments.get(0).value();
File file = new File(scriptFile);
String scriptFile = commandContext.parsedInput()
.options()
.stream()
.filter(o -> "file".equals(o.longName()) || 'f' == o.shortName())
.map(CommandOption::value)
.filter(Objects::nonNull)
.findFirst()
.orElseThrow(() -> new IllegalArgumentException(
"Script command expects option --file or -f with exactly one argument: the absolute path to the script file to execute."));
File file = new File(Objects.requireNonNull(scriptFile));
try (FileInputProvider inputProvider = new FileInputProvider(file)) {
String input;
while ((input = inputProvider.readInput()) != null) {
Expand Down