Skip to content

[Feature][Api] Refactor org.apache.dolphinscheduler.api.controller.TaskInstanceController#11747

Merged
SbloodyS merged 12 commits intoapache:devfrom
Zzihh:task-instance-v2
Nov 16, 2022
Merged

[Feature][Api] Refactor org.apache.dolphinscheduler.api.controller.TaskInstanceController#11747
SbloodyS merged 12 commits intoapache:devfrom
Zzihh:task-instance-v2

Conversation

@Zzihh
Copy link
Copy Markdown
Contributor

@Zzihh Zzihh commented Sep 2, 2022

Purpose of the pull request

Fix #11713

@Zzihh Zzihh mentioned this pull request Sep 2, 2022
Closed
3 tasks
@SbloodyS SbloodyS added refactor feature new feature labels Sep 7, 2022
@SbloodyS SbloodyS added this to the 4.0.0-alpha milestone Sep 7, 2022
@SbloodyS SbloodyS added the first time contributor First-time contributor label Sep 8, 2022
@SbloodyS
Copy link
Copy Markdown
Member

SbloodyS commented Sep 13, 2022

I had approved to run CI.

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Sep 13, 2022 •
edited
Loading

Codecov Report

Merging #11747 (9088e42) into dev (9e6f4d2) will increase coverage by 0.01%.
The diff coverage is 90.62%.

❗ Current head 9088e42 differs from pull request most recent head 94301ee. Consider uploading reports for the commit 94301ee to get more accurate results

@@             Coverage Diff              @@
##                dev   #11747      +/-   ##
============================================
+ Coverage     39.44%   39.46%   +0.01%     
- Complexity     4244     4245       +1     
============================================
  Files          1052     1055       +3     
  Lines         39857    39853       -4     
  Branches       4586     4569      -17     
============================================
+ Hits          15722    15727       +5     
+ Misses        22357    22349       -8     
+ Partials       1778     1777       -1
Impacted Files Coverage Δ
...heduler/api/controller/TaskInstanceController.java 50.00% <0.00%> (+4.54%) ⬆️
...duler/api/controller/TaskInstanceV2Controller.java 87.50% <87.50%> (ø)
...o/taskInstance/TaskInstanceListPagingResponse.java 100.00% <100.00%> (ø)
.../dto/taskInstance/TaskInstanceSuccessResponse.java 100.00% <100.00%> (ø)
...uler/api/service/impl/TaskInstanceServiceImpl.java 58.97% <100.00%> (+1.07%) ⬆️
...erver/master/processor/queue/TaskEventService.java 69.64% <0.00%> (-10.72%) ⬇️
...er/master/dispatch/host/assign/RandomSelector.java 77.77% <0.00%> (-5.56%) ⬇️
...org/apache/dolphinscheduler/remote/utils/Host.java 42.55% <0.00%> (-2.13%) ⬇️
...hinscheduler/plugin/alert/script/ScriptSender.java 70.58% <0.00%> (-1.64%) ⬇️
...e/dolphinscheduler/remote/NettyRemotingClient.java 51.38% <0.00%> (-1.39%) ⬇️
... and 23 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Sep 13, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 26 Code Smells

57.4% 57.4% Coverage
4.3% 4.3% Duplication

caishunfeng
caishunfeng previously approved these changes Oct 10, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@caishunfeng caishunfeng left a comment

Choose a reason for hiding this comment

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

LGTM

@caishunfeng
Copy link
Copy Markdown
Contributor

caishunfeng commented Oct 10, 2022

PTAL @SbloodyS

SbloodyS
SbloodyS previously approved these changes Oct 18, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@SbloodyS SbloodyS left a comment

Choose a reason for hiding this comment

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

+1, Please resolves the conflicts so that we can merge this pr. @Zzih

@Zzihh Zzihh dismissed stale reviews from SbloodyS and caishunfeng via c0dab33 October 20, 2022 08:31
@Zzihh
Copy link
Copy Markdown
Contributor Author

Zzihh commented Oct 20, 2022

+1, Please resolves the conflicts so that we can merge this pr. @Zzih

i'm done

@SbloodyS
Copy link
Copy Markdown
Member

SbloodyS commented Oct 20, 2022

I'll merge this pr as soon as the CI passed. Thanks @Zzih

@Zzihh
Copy link
Copy Markdown
Contributor Author

Zzihh commented Oct 20, 2022

I'll merge this pr as soon as the CI passed. Thanks @Zzih

Have wrong, I'll handle it.

@Zzihh
Copy link
Copy Markdown
Contributor Author

Zzihh commented Oct 20, 2022

I'll merge this pr as soon as the CI passed. Thanks @Zzih

Have wrong, I'll handle it.

@SbloodyS I resubmitted the code,please help me execute the CI again

@SbloodyS
Copy link
Copy Markdown
Member

SbloodyS commented Oct 21, 2022

@SbloodyS I resubmitted the code,please help me execute the CI again

Done.

SbloodyS and others added 4 commits October 21, 2022 10:12
@SbloodyS
Update TaskInstanceServiceImpl.java
cf61ab4 
update license header
@Zzihh
Merge branch 'dev' into task-instance-v2
246cee2
fix code style
6b8b4e0
Merge remote-tracking branch 'origin/task-instance-v2' into task-inst…
2a62ae4 
…ance-v2

# Conflicts:
#	dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TaskInstanceControllerTest.java
@Zzihh
Copy link
Copy Markdown
Contributor Author

Zzihh commented Nov 16, 2022

@SbloodyS i fix conflicts，if need merge，please tell me what to do next。

@SbloodyS
Copy link
Copy Markdown
Member

SbloodyS commented Nov 16, 2022

@SbloodyS i fix conflicts，if need merge，please tell me what to do next。

Please run mvn spotless:apply to fix the code style.

@Zzihh
Copy link
Copy Markdown
Contributor Author

Zzihh commented Nov 16, 2022

@SbloodyS i fix conflicts，if need merge，please tell me what to do next。

Please run mvn spotless:apply to fix the code style.

done.

@SbloodyS SbloodyS added feature new feature 3.2.0 and removed feature new feature labels Nov 16, 2022
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Nov 16, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 19 Code Smells

91.7% 91.7% Coverage
0.0% 0.0% Duplication

@Zzihh
Copy link
Copy Markdown
Contributor Author

Zzihh commented Nov 16, 2022

@SbloodyS may have been done～

@SbloodyS SbloodyS merged commit 0186413 into apache:dev Nov 16, 2022
@SbloodyS
Copy link
Copy Markdown
Member

SbloodyS commented Nov 16, 2022

@SbloodyS may have been done～

Thanks. Looking forwared to your further contribution.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SbloodyS SbloodyS SbloodyS approved these changes

@caishunfeng caishunfeng caishunfeng left review comments

Assignees

@Zzihh Zzihh

Labels

backend feature new feature first time contributor First-time contributor refactor

Projects

DolphinScheduler Roadmap
Status: Done

Milestone

4.0.0-alpha

Development

Successfully merging this pull request may close these issues.

[Feature][Api] Refactor org.apache.dolphinscheduler.api.controller.TaskInstanceController

4 participants

@Zzihh @SbloodyS @codecov-commenter @caishunfeng