Skip to content

[Improvement-18684][TaskPlugin] Trim whitespace in ShellParameters.checkParameters #18685

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

Merged
SbloodyS merged 4 commits into from
Oct 12, 2026
+31 −1
Merged

[Improvement-18684][TaskPlugin] Trim whitespace in ShellParameters.checkParameters #18685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5ff27c
[Improvement-18684][TaskPlugin] Trim whitespace in ShellParameters.ch…
Oct 9, 2026
4eb60aa
Merge branch 'dev' into Improvement-18684
SbloodyS Oct 9, 2026
82e2a56
Merge branch 'dev' into Improvement-18684
SbloodyS Oct 10, 2026
6bb1600
Merge branch 'dev' into Improvement-18684
SbloodyS Oct 12, 2026
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
2 changes: 1 addition & 1 deletion ...sk-shell/src/main/java/org/apache/dolphinscheduler/plugin/task/shell/ShellParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class ShellParameters extends AbstractParameters {

@Override
public boolean checkParameters() {
return rawScript != null && !rawScript.isEmpty();
return rawScript != null && !rawScript.trim().isEmpty();
}

@Override
Expand Down
30 changes: 30 additions & 0 deletions ...hell/src/test/java/org/apache/dolphinscheduler/plugin/task/shell/ShellParametersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
package org.apache.dolphinscheduler.plugin.task.shell;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.apache.dolphinscheduler.plugin.task.api.enums.DataType;
import org.apache.dolphinscheduler.plugin.task.api.enums.Direct;
Expand Down Expand Up @@ -74,4 +76,32 @@ void dealOutParamTest_taskOutputOverrideOut() {
assertEquals("b", varPool.get(0).getValue());
}

@Test
void checkParametersTest_nullRawScript() {
ShellParameters shellParameters = new ShellParameters();
shellParameters.setRawScript(null);
assertFalse(shellParameters.checkParameters());
}

@Test
void checkParametersTest_emptyRawScript() {
ShellParameters shellParameters = new ShellParameters();
shellParameters.setRawScript("");
assertFalse(shellParameters.checkParameters());
}

@Test
void checkParametersTest_validRawScript() {
ShellParameters shellParameters = new ShellParameters();
shellParameters.setRawScript("echo hello");
assertTrue(shellParameters.checkParameters());
}

@Test
void checkParametersTest_whitespaceOnlyRawScript() {
ShellParameters shellParameters = new ShellParameters();
shellParameters.setRawScript(" \n\t ");
assertFalse(shellParameters.checkParameters());
}

}
Loading