Skip to content

Commit bf9a8b7

Browse files
ruanwenjunSbloodyS
andauthored
[Chore] Move generateK8sTaskExecutionContext from AbstractParameters to K8sTaskParameters (#17976)
Co-authored-by: xiangzihao <460888207@qq.com>
1 parent e62cc03 commit bf9a8b7

3 files changed

Lines changed: 25 additions & 28 deletions

File tree

dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/K8sTaskExecutionContext.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919

2020
import java.io.Serializable;
2121

22+
import lombok.AllArgsConstructor;
23+
import lombok.Builder;
2224
import lombok.Data;
25+
import lombok.NoArgsConstructor;
2326

2427
import com.fasterxml.jackson.annotation.JsonCreator;
2528
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -28,6 +31,9 @@
2831
* k8s Task ExecutionContext
2932
*/
3033
@Data
34+
@Builder
35+
@AllArgsConstructor
36+
@NoArgsConstructor
3137
public class K8sTaskExecutionContext implements Serializable {
3238

3339
private String configYaml;
@@ -36,23 +42,11 @@ public class K8sTaskExecutionContext implements Serializable {
3642

3743
private String connectionParams;
3844

39-
public K8sTaskExecutionContext() {
40-
}
41-
4245
@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
4346
public K8sTaskExecutionContext(
4447
@JsonProperty("configYaml") String configYaml,
4548
@JsonProperty("namespace") String namespace) {
4649
this.configYaml = configYaml;
4750
this.namespace = namespace;
4851
}
49-
50-
@Override
51-
public String toString() {
52-
return "K8sTaskExecutionContext{"
53-
+ "namespace=" + namespace
54-
+ ", configYaml='" + configYaml + '\''
55-
+ ", connectionParams='" + connectionParams + '\''
56-
+ '}';
57-
}
5852
}

dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@
1818
package org.apache.dolphinscheduler.plugin.task.api.parameters;
1919

2020
import org.apache.dolphinscheduler.common.utils.JSONUtils;
21-
import org.apache.dolphinscheduler.plugin.task.api.K8sTaskExecutionContext;
2221
import org.apache.dolphinscheduler.plugin.task.api.enums.Direct;
23-
import org.apache.dolphinscheduler.plugin.task.api.enums.ResourceType;
2422
import org.apache.dolphinscheduler.plugin.task.api.model.Property;
2523
import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo;
26-
import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.DataSourceParameters;
2724
import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper;
2825
import org.apache.dolphinscheduler.plugin.task.api.utils.VarPoolUtils;
2926

@@ -72,16 +69,6 @@ public Map<String, Property> getLocalParametersMap() {
7269
return localParametersMaps;
7370
}
7471

75-
public K8sTaskExecutionContext generateK8sTaskExecutionContext(ResourceParametersHelper parametersHelper,
76-
int datasource) {
77-
DataSourceParameters dataSourceParameters =
78-
(DataSourceParameters) parametersHelper.getResourceParameters(ResourceType.DATASOURCE, datasource);
79-
K8sTaskExecutionContext k8sTaskExecutionContext = new K8sTaskExecutionContext();
80-
k8sTaskExecutionContext.setConnectionParams(
81-
Objects.nonNull(dataSourceParameters) ? dataSourceParameters.getConnectionParams() : null);
82-
return k8sTaskExecutionContext;
83-
}
84-
8572
/**
8673
* get input local parameters map if the param direct is IN
8774
*

dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/K8sTaskParameters.java

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@
1717

1818
package org.apache.dolphinscheduler.plugin.task.api.parameters;
1919

20+
import org.apache.dolphinscheduler.plugin.task.api.K8sTaskExecutionContext;
2021
import org.apache.dolphinscheduler.plugin.task.api.enums.ResourceType;
2122
import org.apache.dolphinscheduler.plugin.task.api.model.Label;
2223
import org.apache.dolphinscheduler.plugin.task.api.model.NodeSelectorExpression;
2324
import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo;
25+
import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.DataSourceParameters;
2426
import org.apache.dolphinscheduler.plugin.task.api.parameters.resource.ResourceParametersHelper;
2527

2628
import org.apache.commons.lang3.StringUtils;
@@ -31,9 +33,6 @@
3133
import lombok.Data;
3234
import lombok.extern.slf4j.Slf4j;
3335

34-
/**
35-
* k8s task parameters
36-
*/
3736
@Data
3837
@Slf4j
3938
public class K8sTaskParameters extends AbstractParameters {
@@ -67,4 +66,21 @@ public ResourceParametersHelper getResources() {
6766
resources.put(ResourceType.DATASOURCE, datasource);
6867
return resources;
6968
}
69+
70+
public K8sTaskExecutionContext generateK8sTaskExecutionContext(
71+
ResourceParametersHelper parametersHelper,
72+
int datasource) {
73+
DataSourceParameters dataSourceParameters =
74+
(DataSourceParameters) parametersHelper
75+
.getResourceParameters(ResourceType.DATASOURCE, datasource);
76+
77+
String connectionParams = null;
78+
if (dataSourceParameters != null) {
79+
connectionParams = dataSourceParameters.getConnectionParams();
80+
}
81+
82+
return K8sTaskExecutionContext.builder()
83+
.connectionParams(connectionParams)
84+
.build();
85+
}
7086
}

0 commit comments

Comments
 (0)