-
-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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.
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
[Spring] Spring generator uses old Swagger dependency #5556
Conversation
changed mustaches in spring libs to use it with io.swagger.core.v3 in version 2.1.1 deleted import of old ApiModel and ApiModelProperty in spring libs, io.swagger.core.v3 in version 2.1.1 will be used instead
updated spring samples for client and server to use swagger-annotations 2.1.1
handling security with io.swagger.core.v3 in version 2.1.1 fixed comment
updated spring samples handling security for client and server to use swagger-annotations 2.1.1
Is there a chance that this pullrequest will be reviewed already in this month? |
@wing328 Can you please review this peace of code? |
Any tentative timeline on this PR merge ? |
@wing328 ping |
any update on this? |
The problem is I don't think Sprinfox v2 which is a widely used lib for Spring support OASv3 annotations. |
Sorry for misunderstanding, but how springfox is related in this matter? <dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>2.1.1</version>
</dependency> which this PR fixes. |
These annotations are used by libraries to generate the OAS. Springfox is I think the most widely used lib in the Spring world. Or do you have other libs in mind ? |
Springfox is not required to use openapi-generator-maven-plugin. That's why it confuses me 😄 I was thinking about using the springdoc (which would require the v3 annotations to actually show examples/description) and redoc for static files. |
This PR is not about |
Hello @cbornet . I tested it locally, it works with Springfox v2. |
@cbornet this is specific to the JavaSpring generated output. Since we have a major release coming, I think it would make sense to update to springfox2 3.0.0 in JavaSpring and have this PR integrated in the 5.0 release. If that could be done here, it would also solve issues with pulling openapi-generator into a Spring project generated with our tooling (which currently does not work). See #7102 which is related. |
Oh, great ! I thought this was only part of the v3. Then I have no more concern for this PR. |
modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache
Outdated
Show resolved
Hide resolved
modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache
Outdated
Show resolved
Hide resolved
modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache
Outdated
Show resolved
Hide resolved
samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java
Show resolved
Hide resolved
fixed alignment according to actual master
fixed alignment to 4 spaces
@cbornet i fixed places, that you commented. The rest is okay? |
ping @wing328 |
LGTM. @alexsuperdev can you resolve the conflicts ? |
I tried to resolve them, but not succeeded, its to much work to do, because to many changes were made in code since march. |
@wing328 I guess this one can be closed |
Fix 4245
Updated swagger-annotations dependency from version 1.5.23 to the actual last release 2.1.1
in generated code for spring libraries
So from
To:
PR checklist
./bin/
(or Windows batch scripts under.\bin\windows
) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run./bin/{LANG}-petstore.sh
,./bin/openapi3/{LANG}-petstore.sh
if updating the code or mustache templates for a language ({LANG}
) (e.g. php, ruby, python, etc).master
,4.3.x
,5.0.x
. Default:master
.cc @bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @bkabrda (2020/01)