From 08a9d331fea996f263eb40f9d7564ca26701d428 Mon Sep 17 00:00:00 2001 From: ruanwenjun Date: Fri, 13 Feb 2026 18:10:53 +0800 Subject: [PATCH] [Chore] Move generateK8sTaskExecutionContext from AbstractParameters to K8sTaskParameters --- .../task/api/K8sTaskExecutionContext.java | 18 +++++---------- .../api/parameters/AbstractParameters.java | 13 ----------- .../api/parameters/K8sTaskParameters.java | 22 ++++++++++++++++--- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/K8sTaskExecutionContext.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/K8sTaskExecutionContext.java index 4138e5465fd7..3035752a8b21 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/K8sTaskExecutionContext.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/K8sTaskExecutionContext.java @@ -19,7 +19,10 @@ import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -28,6 +31,9 @@ * k8s Task ExecutionContext */ @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor public class K8sTaskExecutionContext implements Serializable { private String configYaml; @@ -36,9 +42,6 @@ public class K8sTaskExecutionContext implements Serializable { private String connectionParams; - public K8sTaskExecutionContext() { - } - @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) public K8sTaskExecutionContext( @JsonProperty("configYaml") String configYaml, @@ -46,13 +49,4 @@ public K8sTaskExecutionContext( this.configYaml = configYaml; this.namespace = namespace; } - - @Override - public String toString() { - return "K8sTaskExecutionContext{" - + "namespace=" + namespace - + ", configYaml='" + configYaml + '\'' - + ", connectionParams='" + connectionParams + '\'' - + '}'; - } } diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java index 497d851bd8ce..3bc808c2fa8a 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java @@ -18,12 +18,9 @@ package org.apache.dolphinscheduler.plugin.task.api.parameters; import org.apache.dolphinscheduler.common.utils.JSONUtils; -import org.apache.dolphinscheduler.plugin.task.api.K8sTaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.enums.Direct; -import org.apache.dolphinscheduler.plugin.task.api.enums.ResourceType; 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.resource.DataSourceParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper; import org.apache.dolphinscheduler.plugin.task.api.utils.VarPoolUtils; @@ -72,16 +69,6 @@ public Map getLocalParametersMap() { return localParametersMaps; } - public K8sTaskExecutionContext generateK8sTaskExecutionContext(ResourceParametersHelper parametersHelper, - int datasource) { - DataSourceParameters dataSourceParameters = - (DataSourceParameters) parametersHelper.getResourceParameters(ResourceType.DATASOURCE, datasource); - K8sTaskExecutionContext k8sTaskExecutionContext = new K8sTaskExecutionContext(); - k8sTaskExecutionContext.setConnectionParams( - Objects.nonNull(dataSourceParameters) ? dataSourceParameters.getConnectionParams() : null); - return k8sTaskExecutionContext; - } - /** * get input local parameters map if the param direct is IN * diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/K8sTaskParameters.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/K8sTaskParameters.java index 4f045abe1907..2df6001d414c 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/K8sTaskParameters.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/K8sTaskParameters.java @@ -17,10 +17,12 @@ package org.apache.dolphinscheduler.plugin.task.api.parameters; +import org.apache.dolphinscheduler.plugin.task.api.K8sTaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.enums.ResourceType; import org.apache.dolphinscheduler.plugin.task.api.model.Label; import org.apache.dolphinscheduler.plugin.task.api.model.NodeSelectorExpression; import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo; +import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.DataSourceParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper; import org.apache.commons.lang3.StringUtils; @@ -31,9 +33,6 @@ import lombok.Data; import lombok.extern.slf4j.Slf4j; -/** - * k8s task parameters - */ @Data @Slf4j public class K8sTaskParameters extends AbstractParameters { @@ -67,4 +66,21 @@ public ResourceParametersHelper getResources() { resources.put(ResourceType.DATASOURCE, datasource); return resources; } + + public K8sTaskExecutionContext generateK8sTaskExecutionContext( + ResourceParametersHelper parametersHelper, + int datasource) { + DataSourceParameters dataSourceParameters = + (DataSourceParameters) parametersHelper + .getResourceParameters(ResourceType.DATASOURCE, datasource); + + String connectionParams = null; + if (dataSourceParameters != null) { + connectionParams = dataSourceParameters.getConnectionParams(); + } + + return K8sTaskExecutionContext.builder() + .connectionParams(connectionParams) + .build(); + } }