Skip to content

[Improvement-17960][API]Add null/empty/duplicate validation logic for globalParams when creating or updating a workflow #17961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
njnu-seafish wants to merge 4 commits into
base: dev
Choose a base branch
from
+38 −0
Open

[Improvement-17960][API]Add null/empty/duplicate validation logic for globalParams when creating or updating a workflow #17961

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80c18a6
add golbalParams check in backend
Feb 6, 2026
54eaeae
Merge remote-tracking branch 'origin/dev' into Improvement-17960
Mar 3, 2026
d6d74b8
simple validateGlobalParams
Mar 3, 2026
81ecdc7
update comment
Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions ...main/java/org/apache/dolphinscheduler/api/service/impl/WorkflowDefinitionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,9 @@ public Map<String, Object> createWorkflowDefinition(User loginUser,
definition.getName(), definition.getCode());
throw new ServiceException(Status.WORKFLOW_DEFINITION_NAME_EXIST, name);
}

validateGlobalParams(globalParams);

List<TaskDefinitionLog> taskDefinitionLogs = generateTaskDefinitionList(taskDefinitionJson);
List<WorkflowTaskRelationLog> taskRelationList = generateTaskRelationList(taskRelationJson, taskDefinitionLogs);

Expand Down Expand Up @@ -784,6 +787,9 @@ public Map<String, Object> updateWorkflowDefinition(User loginUser,
putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR);
return result;
}

validateGlobalParams(globalParams);

List<TaskDefinitionLog> taskDefinitionLogs = generateTaskDefinitionList(taskDefinitionJson);
List<WorkflowTaskRelationLog> taskRelationList = generateTaskRelationList(taskRelationJson, taskDefinitionLogs);

Expand Down Expand Up @@ -820,6 +826,38 @@ public Map<String, Object> updateWorkflowDefinition(User loginUser,
return result;
}

/**
* Validates global parameters: non-empty keys, no duplicates
*/
private void validateGlobalParams(String globalParams) {
Copy link
Member

@ruanwenjun ruanwenjun Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't be writing this kind of glue code everywhere. Why not use a GlobalParamValidator to handle this task?

if (StringUtils.isBlank(globalParams)) {
return;
}

List<Property> params;
try {
params = JSONUtils.toList(globalParams, Property.class);
} catch (Exception e) {
throw new ServiceException("Invalid globalParams");
}

if (params == null || params.isEmpty()) {
return;
}

Set<String> keys = new HashSet<>();
for (Property p : params) {
if (StringUtils.isEmpty(p.getProp())) {
throw new ServiceException("Global param key cannot be empty");
}

String key = p.getProp().trim();
if (!keys.add(key)) {
throw new ServiceException("Duplicate global param key: " + key);
}
}
}

/**
* Task want to delete whether used in other task, should throw exception when have be used.
* <p>
Expand Down