Skip to content
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

Jump to bottom

[Improvement] add springdoc-openapi-ui #12379

Merged
merged 14 commits into from
Oct 23, 2022
Merged

[Improvement] add springdoc-openapi-ui #12379

merged 14 commits into from
Oct 23, 2022

Conversation

fuchanghai
Copy link
Member

@fuchanghai fuchanghai commented Oct 14, 2022 •
edited
Loading

Purpose of the pull request

Brief change log

relation docs

update annotation

image

result:
image

Verify this pull request

This pull request is code cleanup without any test coverage.

this close : #12331

@kezhenxu94
Copy link
Member

If you are replacing springfox with springdoc, can you remove the springfox dependencies?

@fuchanghai
Copy link
Member Author

If you are replacing springfox with springdoc, can you remove the springfox dependencies?

i'll fix it,thx

@codecov-commenter
Copy link

codecov-commenter commented Oct 15, 2022 •
edited
Loading

Codecov Report

Merging #12379 (59f52a7) into dev (1384d8f) will increase coverage by 0.37%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##                dev   #12379      +/-   ##
============================================
+ Coverage     39.41%   39.78%   +0.37%     
- Complexity     4217     4507     +290     
============================================
  Files          1039     1044       +5     
  Lines         39140    41841    +2701     
  Branches       4473     5375     +902     
============================================
+ Hits          15427    16647    +1220     
- Misses        21940    23358    +1418     
- Partials       1773     1836      +63
Impacted Files Coverage Δ
...nscheduler/api/configuration/AppConfiguration.java 93.93% <ø> (ø)
...cheduler/api/controller/AccessTokenController.java 87.50% <ø> (ø)
...eduler/api/controller/AccessTokenV2Controller.java 100.00% <ø> (ø)
...scheduler/api/controller/AlertGroupController.java 78.57% <ø> (ø)
.../api/controller/AlertPluginInstanceController.java 100.00% <ø> (ø)
...inscheduler/api/controller/AuditLogController.java 66.66% <ø> (ø)
...hinscheduler/api/controller/ClusterController.java 89.47% <ø> (ø)
...heduler/api/controller/DataAnalysisController.java 100.00% <ø> (ø)
...cheduler/api/controller/DataQualityController.java 64.70% <ø> (ø)
...scheduler/api/controller/DataSourceController.java 38.70% <ø> (ø)
... and 118 more

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

@fuchanghai
Copy link
Member Author

i have a problem that can't autowire two version's OpenAI

github-advanced-security[bot]
github-advanced-security bot found potential problems Oct 15, 2022
View reviewed changes
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

CodeQL found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.

@SbloodyS SbloodyS added this to the 3.1.1 milestone Oct 15, 2022
@ruanwenjun
Copy link
Member

i have a problem that can't autowire two version's OpenAI

Can we use two GroupedOpenApi to represent two versions? I don't go deep into this.

@ruanwenjun ruanwenjun added dependencies Pull requests that update a dependency file improvement make more easy to user or prompt friendly labels Oct 16, 2022
@fuchanghai
Copy link
Member Author

fuchanghai commented Oct 16, 2022 •
edited
Loading

i have a problem that can't autowire two version's OpenAI

Can we use two GroupedOpenApi to represent two versions? I don't go deep into this.

Thanks for your reminding. I find what you said seems to be true
image

@fuchanghai
Copy link
Member Author

@ruanwenjun can you help me to fix the problem that can not pass check dependencies

@kezhenxu94
Copy link
Member

@ruanwenjun can you help me to fix the problem that can not pass check dependencies

Please ignore the OWASP Dependency Check failure.

@fuchanghai
Copy link
Member Author

@ruanwenjun @kezhenxu94 plz review this PR

ruanwenjun
ruanwenjun requested changes Oct 17, 2022
View reviewed changes
Copy link
Member

@ruanwenjun ruanwenjun left a comment

Choose a reason for hiding this comment

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

It seems you didn't set the right mapping of v1 and v2, and please remove the swagger.properties, this file is used in spring fox.
image

...er-api/src/main/java/org/apache/dolphinscheduler/api/configuration/OpenAPIConfiguration.java Outdated Show resolved Hide resolved
...er-api/src/main/java/org/apache/dolphinscheduler/api/configuration/OpenAPIConfiguration.java Outdated Show resolved Hide resolved
@fuchanghai fuchanghai requested review from ruanwenjun and removed request for caishunfeng, kezhenxu94 and SbloodyS October 18, 2022 05:45
@fuchanghai
Copy link
Member Author

@ruanwenjun plz have a look

@ruanwenjun
Copy link
Member

@fuchanghai Basically LGTM, please resolved the conflicts.

fuchanghai and others added 9 commits October 22, 2022 12:25
@fuchanghai fuchanghai closed this Oct 23, 2022
@fuchanghai fuchanghai reopened this Oct 23, 2022
@fuchanghai fuchanghai closed this Oct 23, 2022
@fuchanghai fuchanghai reopened this Oct 23, 2022
@sonarcloud
Copy link

sonarcloud bot commented Oct 23, 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 431 Code Smells

90.0% 90.0% Coverage
2.3% 2.3% Duplication

@ruanwenjun ruanwenjun modified the milestones: 3.1.1, 3.2.0 Oct 23, 2022
@ruanwenjun ruanwenjun merged commit 77e29b5 into apache:dev Oct 23, 2022
Chris-Arith pushed a commit to Chris-Arith/dolphinscheduler that referenced this pull request Oct 26, 2022
@fuchanghai @ruanwenjun @Chris-Arith
[Improvement] add springdoc-openapi-ui (apache#12379)
cd79098 
Co-authored-by: fuchanghai <‘2875334588@qq.com’>
Co-authored-by: Wenjun Ruan <wenjun@apache.org>
@fuchanghai fuchanghai deleted the improve-#12331 branch November 30, 2022 05:46
@fuchanghai fuchanghai mentioned this pull request Mar 6, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruanwenjun ruanwenjun ruanwenjun approved these changes

Assignees

@fuchanghai fuchanghai

Labels
backend dependencies Pull requests that update a dependency file improvement make more easy to user or prompt friendly
Projects
None yet
Milestone
3.2.0
Development

Successfully merging this pull request may close these issues.

[Improvement][API] Use springdoc-openapi to replace springfox
5 participants
@fuchanghai @kezhenxu94 @codecov-commenter @ruanwenjun @SbloodyS