You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ca...@apache.org on 2022/07/12 08:41:22 UTC
[dolphinscheduler] branch dev updated: [bug][task-plugins]fix switch class name and add param check to the switch task plugin (#10894)
This is an automated email from the ASF dual-hosted git repository.
caishunfeng 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 499e5b1307 [bug][task-plugins]fix switch class name and add param check to the switch task plugin (#10894)
499e5b1307 is described below
commit 499e5b1307665928f2a17e878d091ac593adbfd8
Author: Tq <ti...@gmail.com>
AuthorDate: Tue Jul 12 16:41:15 2022 +0800
[bug][task-plugins]fix switch class name and add param check to the switch task plugin (#10894)
* fix switch class name and add param check to the switch task plugin
---
...askChannelFactory.java => SwitchCondition.java} | 30 +++---
.../plugin/task/switchtask/SwitchParameters.java | 101 +++++++++++++++++++++
...ssTaskChannelFactory.java => SwitchResult.java} | 30 +++---
...cessTaskChannel.java => SwitchTaskChannel.java} | 7 +-
...lFactory.java => SwitchTaskChannelFactory.java} | 12 +--
5 files changed, 133 insertions(+), 47 deletions(-)
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannelFactory.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchCondition.java
similarity index 55%
copy from dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannelFactory.java
copy to dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchCondition.java
index 68807ba752..8474950c8c 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannelFactory.java
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchCondition.java
@@ -17,30 +17,24 @@
package org.apache.dolphinscheduler.plugin.task.switchtask;
-import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYPE_SWITCH;
+public class SwitchCondition {
-import org.apache.dolphinscheduler.plugin.task.api.TaskChannel;
-import org.apache.dolphinscheduler.plugin.task.api.TaskChannelFactory;
-import org.apache.dolphinscheduler.spi.params.base.PluginParams;
+ private String condition;
+ private Long nextNode;
-import java.util.List;
-
-import com.google.auto.service.AutoService;
+ public String getCondition() {
+ return condition;
+ }
-@AutoService(TaskChannelFactory.class)
-public class SubProcessTaskChannelFactory implements TaskChannelFactory {
- @Override
- public TaskChannel create() {
- return new SubProcessTaskChannel();
+ public void setCondition(String condition) {
+ this.condition = condition;
}
- @Override
- public String getName() {
- return TASK_TYPE_SWITCH;
+ public Long getNextNode() {
+ return nextNode;
}
- @Override
- public List<PluginParams> getParams() {
- return null;
+ public void setNextNode(Long nextNode) {
+ this.nextNode = nextNode;
}
}
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchParameters.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchParameters.java
new file mode 100644
index 0000000000..d92fd45993
--- /dev/null
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchParameters.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.plugin.task.switchtask;
+
+import org.apache.dolphinscheduler.plugin.task.api.model.Property;
+import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo;
+import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
+import org.apache.dolphinscheduler.spi.utils.StringUtils;
+
+import java.util.List;
+
+public class SwitchParameters extends AbstractParameters {
+
+ /**
+ * shell script
+ */
+ private String rawScript;
+
+ /**
+ * local parameters
+ */
+ public List<Property> localParams;
+
+ private SwitchResult switchResult;
+
+ /**
+ * resource list
+ */
+ private List<ResourceInfo> resourceList;
+
+ public String getRawScript() {
+ return rawScript;
+ }
+
+ public void setRawScript(String rawScript) {
+ this.rawScript = rawScript;
+ }
+
+ public List<ResourceInfo> getResourceList() {
+ return resourceList;
+ }
+
+ public void setResourceList(List<ResourceInfo> resourceList) {
+ this.resourceList = resourceList;
+ }
+
+ @Override
+ public List<Property> getLocalParams() {
+ return localParams;
+ }
+
+ @Override
+ public void setLocalParams(List<Property> localParams) {
+ this.localParams = localParams;
+ }
+
+ public SwitchResult getSwitchResult() {
+ return switchResult;
+ }
+
+ public void setSwitchResult(SwitchResult switchResult) {
+ this.switchResult = switchResult;
+ }
+
+ @Override
+ public boolean checkParameters() {
+ //default next node should not be null
+ boolean defaultNode = switchResult != null && switchResult.getNextNode() != null;
+ if (!defaultNode) {
+ return false;
+ }
+ //validate conditions must have next node
+ List<SwitchCondition> conditions = this.switchResult.getDependTaskList();
+ if (conditions != null && conditions.size() != 0) {
+ if (conditions.stream().anyMatch(e -> (StringUtils.isNotEmpty(e.getCondition()) && e.getNextNode() == null))) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public List<ResourceInfo> getResourceFilesList() {
+ return resourceList;
+ }
+}
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannelFactory.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchResult.java
similarity index 56%
copy from dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannelFactory.java
copy to dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchResult.java
index 68807ba752..da67918a61 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannelFactory.java
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchResult.java
@@ -17,30 +17,26 @@
package org.apache.dolphinscheduler.plugin.task.switchtask;
-import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYPE_SWITCH;
+import java.util.List;
-import org.apache.dolphinscheduler.plugin.task.api.TaskChannel;
-import org.apache.dolphinscheduler.plugin.task.api.TaskChannelFactory;
-import org.apache.dolphinscheduler.spi.params.base.PluginParams;
+public class SwitchResult {
+ private List<SwitchCondition> dependTaskList;
-import java.util.List;
+ private Long nextNode;
-import com.google.auto.service.AutoService;
+ public List<SwitchCondition> getDependTaskList() {
+ return dependTaskList;
+ }
-@AutoService(TaskChannelFactory.class)
-public class SubProcessTaskChannelFactory implements TaskChannelFactory {
- @Override
- public TaskChannel create() {
- return new SubProcessTaskChannel();
+ public void setDependTaskList(List<SwitchCondition> dependTaskList) {
+ this.dependTaskList = dependTaskList;
}
- @Override
- public String getName() {
- return TASK_TYPE_SWITCH;
+ public Long getNextNode() {
+ return nextNode;
}
- @Override
- public List<PluginParams> getParams() {
- return null;
+ public void setNextNode(Long nextNode) {
+ this.nextNode = nextNode;
}
}
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannel.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchTaskChannel.java
similarity index 81%
rename from dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannel.java
rename to dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchTaskChannel.java
index fed18b4571..7c5bfa75e0 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannel.java
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchTaskChannel.java
@@ -22,12 +22,10 @@ import org.apache.dolphinscheduler.plugin.task.api.TaskChannel;
import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
import org.apache.dolphinscheduler.plugin.task.api.parameters.ParametersNode;
-import org.apache.dolphinscheduler.plugin.task.api.parameters.SwitchParameters;
import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper;
import org.apache.dolphinscheduler.spi.utils.JSONUtils;
-import org.apache.dolphinscheduler.spi.utils.StringUtils;
-public class SubProcessTaskChannel implements TaskChannel {
+public class SwitchTaskChannel implements TaskChannel {
@Override
public void cancelApplication(boolean status) {
@@ -41,8 +39,7 @@ public class SubProcessTaskChannel implements TaskChannel {
@Override
public AbstractParameters parseParameters(ParametersNode parametersNode) {
- return JSONUtils.parseObject(StringUtils.isEmpty(parametersNode.getSwitchResult())
- ? parametersNode.getTaskParams() : parametersNode.getSwitchResult(), SwitchParameters.class);
+ return JSONUtils.parseObject(parametersNode.getTaskParams(), SwitchParameters.class);
}
@Override
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannelFactory.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchTaskChannelFactory.java
similarity index 84%
rename from dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannelFactory.java
rename to dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchTaskChannelFactory.java
index 68807ba752..fb41a0b677 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannelFactory.java
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SwitchTaskChannelFactory.java
@@ -17,26 +17,24 @@
package org.apache.dolphinscheduler.plugin.task.switchtask;
-import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYPE_SWITCH;
-
+import com.google.auto.service.AutoService;
import org.apache.dolphinscheduler.plugin.task.api.TaskChannel;
import org.apache.dolphinscheduler.plugin.task.api.TaskChannelFactory;
+import org.apache.dolphinscheduler.plugin.task.api.TaskConstants;
import org.apache.dolphinscheduler.spi.params.base.PluginParams;
import java.util.List;
-import com.google.auto.service.AutoService;
-
@AutoService(TaskChannelFactory.class)
-public class SubProcessTaskChannelFactory implements TaskChannelFactory {
+public class SwitchTaskChannelFactory implements TaskChannelFactory {
@Override
public TaskChannel create() {
- return new SubProcessTaskChannel();
+ return new SwitchTaskChannel();
}
@Override
public String getName() {
- return TASK_TYPE_SWITCH;
+ return TaskConstants.TASK_TYPE_SWITCH;
}
@Override