From 652ef639a2c6cb5ecfd7ad3bff3a02333022c2cb Mon Sep 17 00:00:00 2001 From: shaolei Date: Wed, 18 Mar 2026 15:11:21 +0800 Subject: [PATCH 1/4] deal conflict --- .../dolphinscheduler/plugin/task/dinky/DinkyTask.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java index 70bc8fbffb69..f8b8dd7379d5 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java @@ -131,7 +131,7 @@ private void submitApplicationV0() { status = result.get(apiResultDatasKey).get(DinkyTaskConstants.API_RESULT_SUCCESS).asBoolean(); if (result.get(apiResultDatasKey).has(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) && !(result.get(apiResultDatasKey) - .get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) instanceof NullNode)) { + .get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) instanceof NullNode)) { jobInstanceId = result.get(apiResultDatasKey).get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID).asText(); } @@ -157,7 +157,7 @@ private void submitApplicationV1() { status = result.get(DinkyTaskConstants.API_RESULT_SUCCESS).asBoolean(); if (result.get(apiResultDataKey).has(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) && !(result.get(apiResultDataKey) - .get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) instanceof NullNode)) { + .get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) instanceof NullNode)) { jobInstanceId = result.get(apiResultDataKey).get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID).asText(); } @@ -471,4 +471,4 @@ private String sendJsonStr(String url, String params) { return result; } -} +} \ No newline at end of file From 23db582b8e24e614b1c36ac5db44b3705cc6c380 Mon Sep 17 00:00:00 2001 From: shaolei Date: Wed, 18 Mar 2026 15:26:59 +0800 Subject: [PATCH 2/4] deal conflict --- .../plugin/task/dinky/DinkyTask.java | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java index f8b8dd7379d5..979e5f7afccb 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java @@ -27,8 +27,6 @@ import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.model.Property; import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters; -import org.apache.dolphinscheduler.plugin.task.api.parser.PlaceholderUtils; -import org.apache.dolphinscheduler.plugin.task.api.utils.GlobalParameterUtils; import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils; import org.apache.commons.lang3.StringUtils; @@ -339,24 +337,22 @@ public void cancelApplication() throws TaskException { private Map generateVariables() { Map variables = new ConcurrentHashMap<>(); - List propertyList = - GlobalParameterUtils.deserializeGlobalParameter(taskExecutionContext.getGlobalParams()); - if (propertyList != null && !propertyList.isEmpty()) { - for (Property property : propertyList) { - variables.put(property.getProp(), property.getValue()); + Map prepareParamsMap = taskExecutionContext.getPrepareParamsMap(); + prepareParamsMap.forEach((key, property) -> { + if (property != null && property.getValue() != null) { + variables.put(key, property.getValue().trim()); } - } + }); List localParams = this.dinkyParameters.getLocalParams(); - Map prepareParamsMap = taskExecutionContext.getPrepareParamsMap(); - if (localParams == null || localParams.isEmpty()) { - return variables; - } - Map convertMap = ParameterUtils.convert(prepareParamsMap); - for (Property property : localParams) { - String propertyValue = property.getValue(); - String value = PlaceholderUtils.replacePlaceholders(propertyValue, convertMap, true); - variables.put(property.getProp(), value); + if (localParams != null) { + for (Property property : localParams) { + String value = ParameterUtils.convertParameterPlaceholders(property.getValue(), variables); + if (value != null && !value.isEmpty()) { + variables.put(property.getProp(), value.trim()); + } + } } + log.info("sending variables to dinky: {}", variables); return variables; } From 23ed07d737670f89f664dba6ed1fc45ae9121dac Mon Sep 17 00:00:00 2001 From: shaolei Date: Wed, 18 Mar 2026 15:48:31 +0800 Subject: [PATCH 3/4] deal conflict --- .../apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java index 979e5f7afccb..af13abc47679 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java @@ -129,7 +129,7 @@ private void submitApplicationV0() { status = result.get(apiResultDatasKey).get(DinkyTaskConstants.API_RESULT_SUCCESS).asBoolean(); if (result.get(apiResultDatasKey).has(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) && !(result.get(apiResultDatasKey) - .get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) instanceof NullNode)) { + .get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) instanceof NullNode)) { jobInstanceId = result.get(apiResultDatasKey).get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID).asText(); } @@ -155,7 +155,7 @@ private void submitApplicationV1() { status = result.get(DinkyTaskConstants.API_RESULT_SUCCESS).asBoolean(); if (result.get(apiResultDataKey).has(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) && !(result.get(apiResultDataKey) - .get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) instanceof NullNode)) { + .get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID) instanceof NullNode)) { jobInstanceId = result.get(apiResultDataKey).get(DinkyTaskConstants.API_RESULT_JOB_INSTANCE_ID).asText(); } From 65866e2b26042482344fb8dd33f4772d1564a194 Mon Sep 17 00:00:00 2001 From: shaolei Date: Thu, 19 Mar 2026 15:08:15 +0800 Subject: [PATCH 4/4] Revert unnessnary chanage --- .../apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java index af13abc47679..ca531261472b 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-dinky/src/main/java/org/apache/dolphinscheduler/plugin/task/dinky/DinkyTask.java @@ -467,4 +467,4 @@ private String sendJsonStr(String url, String params) { return result; } -} \ No newline at end of file +}