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 9d3c0085fb [Fix-18269][Master] Move LogicFakeTask to test scope
(#18270)
9d3c0085fb is described below
commit 9d3c0085fb2927d30dc37c5ddcbc222135b0cb93
Author: Wenjun Ruan <[email protected]>
AuthorDate: Fri May 15 15:25:21 2026 +0800
[Fix-18269][Master] Move LogicFakeTask to test scope (#18270)
---
.../server/master/integration}/fake/LogicFakeTask.java | 3 +--
.../server/master/integration/fake}/LogicFakeTaskChannel.java | 4 ++--
.../master/integration/fake}/LogicFakeTaskChannelFactory.java | 2 +-
.../master/integration/fake}/LogicFakeTaskParameters.java | 4 +++-
.../master/integration/fake}/LogicFakeTaskParametersTest.java | 2 +-
.../master/integration}/fake/LogicFakeTaskPluginFactory.java | 10 +---------
.../plugin/task/api/TaskPluginManagerTest.java | 10 ++++++++++
7 files changed, 19 insertions(+), 16 deletions(-)
diff --git
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/executor/plugin/fake/LogicFakeTask.java
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTask.java
similarity index 97%
rename from
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/executor/plugin/fake/LogicFakeTask.java
rename to
dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTask.java
index f0a62a9858..8a18408b50 100644
---
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/executor/plugin/fake/LogicFakeTask.java
+++
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTask.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.server.master.engine.executor.plugin.fake;
+package org.apache.dolphinscheduler.server.master.integration.fake;
import org.apache.dolphinscheduler.common.thread.ThreadUtils;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
-import
org.apache.dolphinscheduler.plugin.task.api.parameters.LogicFakeTaskParameters;
import
org.apache.dolphinscheduler.plugin.task.api.parser.TaskOutputParameterParser;
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import
org.apache.dolphinscheduler.server.master.engine.executor.plugin.AbstractLogicTask;
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/task/LogicFakeTaskChannel.java
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskChannel.java
similarity index 89%
rename from
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/task/LogicFakeTaskChannel.java
rename to
dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskChannel.java
index e5f4d3c366..29eb19b925 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/task/LogicFakeTaskChannel.java
+++
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskChannel.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.plugin.task.api.task;
+package org.apache.dolphinscheduler.server.master.integration.fake;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import
org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
-import
org.apache.dolphinscheduler.plugin.task.api.parameters.LogicFakeTaskParameters;
+import
org.apache.dolphinscheduler.plugin.task.api.task.AbstractLogicTaskChannel;
import com.google.common.annotations.VisibleForTesting;
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/task/LogicFakeTaskChannelFactory.java
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskChannelFactory.java
similarity index 95%
rename from
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/task/LogicFakeTaskChannelFactory.java
rename to
dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskChannelFactory.java
index 8eb653c61b..a1c0e02f51 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/task/LogicFakeTaskChannelFactory.java
+++
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskChannelFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.plugin.task.api.task;
+package org.apache.dolphinscheduler.server.master.integration.fake;
import org.apache.dolphinscheduler.plugin.task.api.TaskChannel;
import org.apache.dolphinscheduler.plugin.task.api.TaskChannelFactory;
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/LogicFakeTaskParameters.java
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskParameters.java
similarity index 90%
rename from
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/LogicFakeTaskParameters.java
rename to
dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskParameters.java
index 59d343c229..d05c2c6a60 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/LogicFakeTaskParameters.java
+++
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskParameters.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.plugin.task.api.parameters;
+package org.apache.dolphinscheduler.server.master.integration.fake;
+
+import
org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
import org.apache.commons.lang3.StringUtils;
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/parameters/LogicFakeTaskParametersTest.java
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskParametersTest.java
similarity index 96%
rename from
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/parameters/LogicFakeTaskParametersTest.java
rename to
dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskParametersTest.java
index 804c94c705..a9fffd3bfa 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/parameters/LogicFakeTaskParametersTest.java
+++
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskParametersTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.plugin.task.api.parameters;
+package org.apache.dolphinscheduler.server.master.integration.fake;
import static com.google.common.truth.Truth.assertThat;
diff --git
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/executor/plugin/fake/LogicFakeTaskPluginFactory.java
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskPluginFactory.java
similarity index 76%
rename from
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/executor/plugin/fake/LogicFakeTaskPluginFactory.java
rename to
dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskPluginFactory.java
index 8ebcdbe1f0..b62caa6572 100644
---
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/executor/plugin/fake/LogicFakeTaskPluginFactory.java
+++
b/dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/fake/LogicFakeTaskPluginFactory.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.server.master.engine.executor.plugin.fake;
+package org.apache.dolphinscheduler.server.master.integration.fake;
-import
org.apache.dolphinscheduler.plugin.task.api.task.LogicFakeTaskChannelFactory;
-import org.apache.dolphinscheduler.server.master.engine.IWorkflowRepository;
import
org.apache.dolphinscheduler.server.master.engine.executor.plugin.ILogicTaskPluginFactory;
import org.apache.dolphinscheduler.task.executor.ITaskExecutor;
@@ -30,12 +28,6 @@ import com.google.common.annotations.VisibleForTesting;
@VisibleForTesting
public class LogicFakeTaskPluginFactory implements
ILogicTaskPluginFactory<LogicFakeTask> {
- private final IWorkflowRepository workflowRepository;
-
- public LogicFakeTaskPluginFactory(final IWorkflowRepository
workflowRepository) {
- this.workflowRepository = workflowRepository;
- }
-
@Override
public LogicFakeTask createLogicTask(final ITaskExecutor taskExecutor) {
return new LogicFakeTask(taskExecutor.getTaskExecutionContext());
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/TaskPluginManagerTest.java
b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/TaskPluginManagerTest.java
index cde0579d2e..7ad06c7bcd 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/TaskPluginManagerTest.java
+++
b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/TaskPluginManagerTest.java
@@ -24,6 +24,7 @@ import
org.apache.dolphinscheduler.plugin.task.api.task.DependentLogicTaskChanne
import
org.apache.dolphinscheduler.plugin.task.api.task.SubWorkflowLogicTaskChannelFactory;
import
org.apache.dolphinscheduler.plugin.task.api.task.SwitchLogicTaskChannelFactory;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -39,4 +40,13 @@ class TaskPluginManagerTest {
assertThat(TaskPluginManager.getTaskChannel(type)).isNotNull();
}
+ @Test
+ void shouldNotLoadLogicFakeTaskChannel() {
+ IllegalArgumentException exception =
org.junit.jupiter.api.Assertions.assertThrows(
+ IllegalArgumentException.class,
+ () -> TaskPluginManager.getTaskChannel("LogicFakeTask"));
+
+ assertThat(exception).hasMessageThat().contains("Cannot find
TaskChannel");
+ }
+
}
