[Improvement-18249][DAO] Route ProjectMapper and WorkflowDefinitionMapper access through repository Dao#18250
Open
ruanwenjun wants to merge 1 commit into
Open
[Improvement-18249][DAO] Route ProjectMapper and WorkflowDefinitionMapper access through repository Dao#18250ruanwenjun wants to merge 1 commit into
ruanwenjun wants to merge 1 commit into
Conversation
…pper access through repository Dao Tracking issue: apache#18249 Add the remaining query methods on ProjectDao and WorkflowDefinitionDao, and replace every direct ProjectMapper / WorkflowDefinitionMapper reference in dolphinscheduler-api with the corresponding Dao, so Mapper usage stays inside dolphinscheduler-dao.repository as documented in dolphinscheduler-dao/CLAUDE.md. Notes: - WorkflowDefinitionDao#queryByCode returns Optional<WorkflowDefinition> (Mapper returned a bare nullable WorkflowDefinition), so affected ServiceImpl call sites use .orElse(null) for behavior-preserving substitution. Test classes were migrated to mock the Dao instead of the Mapper; queryByCode stubs are wrapped with Optional.of / Optional.empty. - BaseDao#deleteById and BaseDao#updateById return boolean where the Mapper returned int; affected call sites in ProjectServiceImpl, TaskDefinitionServiceImpl and their tests were adapted accordingly. selectBatchIds was replaced with the equivalent IDao#queryByIds. - ProcessServiceImpl in dolphinscheduler-service still depends on WorkflowDefinitionMapper and is out of scope for this commit; TaskDefinitionServiceImplTest keeps both a Dao and a Mapper mock to serve the two @Injectmocks targets it exercises. No production behavior changes; the Mapper interfaces themselves are untouched.
ruanwenjun
force-pushed
the
dao/workflow-definition
branch
from
22db01d to
0d2aa03
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| Arrays.stream(projectIds.split(",")).distinct().forEach(projectId -> { | ||
| // 3. check if project is existed | ||
| Project project = this.projectMapper.queryDetailById(Integer.parseInt(projectId)); | ||
| Project project = this.projectDao.queryDetailById(Integer.parseInt(projectId)); |
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Was this PR generated or assisted by AI?
YES, ops 4.7
Purpose of the pull request
Tracking issue: #18249
Add the remaining query methods on ProjectDao and WorkflowDefinitionDao, and replace every direct ProjectMapper / WorkflowDefinitionMapper reference in dolphinscheduler-api with the corresponding Dao, so Mapper usage stays inside dolphinscheduler-dao.repository as documented in dolphinscheduler-dao/CLAUDE.md.
Notes:
No production behavior changes; the Mapper interfaces themselves are untouched.
Brief change log
Verify this pull request
This pull request is code cleanup without any test coverage.
(or)
This pull request is already covered by existing tests, such as (please describe tests).
(or)
This change added tests and can be verified as follows:
(or)
Pull Request Notice
Pull Request Notice
If your pull request contains incompatible change, you should also add it to
docs/docs/en/guide/upgrade/incompatible.md