[Improvement-17158] Support query by wrapper in BaseDao#17163
Draft
ruanwenjun wants to merge 2 commits intoapache:devfrom
Draft
[Improvement-17158] Support query by wrapper in BaseDao#17163ruanwenjun wants to merge 2 commits intoapache:devfrom
ruanwenjun wants to merge 2 commits intoapache:devfrom
Conversation
c134d05 to
326997b
Compare
Contributor
There was a problem hiding this comment.
Pull Request Overview
This pull request refactors query methods by removing multiple dedicated methods (e.g. queryByCode variants) and consolidating them into a generic query-by-wrapper approach in the BaseDao. Key changes include removal of redundant mapper methods, conversion of query methods in WorkflowInstanceDaoImpl and BaseDao to use lambda-based wrappers, and corresponding adjustments in tests and service implementations for workflow instance queries.
Reviewed Changes
Copilot reviewed 24 out of 24 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| dolphinscheduler-dao/* | Removed XML and mapper query methods and simplified DAO implementations |
| dolphinscheduler-api/* | Updated service and test layers to use the new wrapper-based query methods in place of deprecated ones |
| BaseDao.java, IDao.java | Adapted interface signatures to use Java Function-based query conditions |
Comments suppressed due to low confidence (1)
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java:255
- Instead of returning null for query methods in tests, return an empty list to align with expected non-null collection responses.
when(workflowInstanceDao.queryByCondition(Mockito.any())).thenReturn(null);
.../src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkflowInstanceServiceImpl.java
Outdated
Show resolved
Hide resolved
Open
3 tasks
…/api/service/impl/WorkflowInstanceServiceImpl.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
72db50b to
97f374a
Compare
|
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
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.


Purpose of the pull request
close #17158
Avoid write a lot of method e.g.
queryByCode,queryByCodeAndVersion,queryByCodeAndVersionAndStatusBrief 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