This is an automated email from the ASF dual-hosted git repository.
SbloodyS pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 570aab83d1 [Improvement-18684][TaskPlugin] Trim whitespace in
ShellParameters.checkParameters (#18685)
570aab83d1 is described below
commit 570aab83d11d7d35a99ebde1dc47a758771551c4
Author: chovygo <[email protected]>
AuthorDate: Mon Oct 12 14:31:43 2026 +0800
[Improvement-18684][TaskPlugin] Trim whitespace in
ShellParameters.checkParameters (#18685)
---
.../plugin/task/shell/ShellParameters.java | 2 +-
.../plugin/task/shell/ShellParametersTest.java | 30 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/main/java/org/apache/dolphinscheduler/plugin/task/shell/ShellParameters.java
b/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/main/java/org/apache/dolphinscheduler/plugin/task/shell/ShellParameters.java
index dee73d10ea..e8f1e80cac 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/main/java/org/apache/dolphinscheduler/plugin/task/shell/ShellParameters.java
+++
b/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/main/java/org/apache/dolphinscheduler/plugin/task/shell/ShellParameters.java
@@ -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
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/test/java/org/apache/dolphinscheduler/plugin/task/shell/ShellParametersTest.java
b/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/test/java/org/apache/dolphinscheduler/plugin/task/shell/ShellParametersTest.java
index a64449bd0c..7bb7f0e6b7 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/test/java/org/apache/dolphinscheduler/plugin/task/shell/ShellParametersTest.java
+++
b/dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/test/java/org/apache/dolphinscheduler/plugin/task/shell/ShellParametersTest.java
@@ -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;
@@ -74,4 +76,32 @@ class ShellParametersTest {
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());
+ }
+
}