Skip to content

Conversation

fwermelskirchen
Copy link
Contributor

@fwermelskirchen fwermelskirchen commented Sep 22, 2025

to fix #3668 based on #17696

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package || exit
    ./bin/generate-samples.sh ./bin/configs/*.yaml || exit
    ./bin/utils/export_docs_generators.sh || exit
    
    (For Windows users, please run the script in WSL)
    Commit all changed files.
    This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
    These must match the expectations made by your contribution.
    You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
    IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
  • File the PR against the correct branch: master (upcoming 7.x.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
  • If your PR solves a reported issue, reference it using GitHub's linking syntax (e.g., having "fixes #123" present in the PR description)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

fizzet and others added 5 commits January 24, 2024 13:50
# Conflicts:
#	modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java
#	modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java
#	samples/client/petstore/jaxrs-cxf-client-jackson/src/gen/java/org/openapitools/model/Pet.java
#	samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java
#	samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java
#	samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java
#	samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
#	samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
#	samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java
#	samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java
#	samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
#	samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java
#	samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java
@wing328
Copy link
Member

wing328 commented Sep 22, 2025

@wing328 wing328 changed the title Add swagger2 resolve conflicts [cxf] add support for Swagger2 Sep 24, 2025
@wing328
Copy link
Member

wing328 commented Sep 24, 2025

tested locally and the result is good

[INFO] Running org.openapitools.api.PetApiTest
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.661 s -- in org.openapitools.api.PetApiTest
[INFO] Running org.openapitools.api.StoreApiTest
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 s -- in org.openapitools.api.StoreApiTest
[INFO] Running org.openapitools.api.UserApiTest
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.057 s -- in org.openapitools.api.UserApiTest
[INFO]
[INFO] Results:
[INFO]
[INFO] Tests run: 20, Failures: 0, Errors: 0, Skipped: 0
[INFO]
[INFO]
[INFO] --- jar:3.3.0:jar (default-jar) @ openapi-jaxrs-client ---
[INFO] Building jar: C:\Users\wing3\AppData\Local\Temp\jaxrs\target\openapi-jaxrs-client-1.0.0.jar
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time:  5.987 s
[INFO] Finished at: 2025-09-24T15:14:01+08:00

i'll add some tests later with another pr

thanks again for the PR

@wing328 wing328 merged commit f02acaf into OpenAPITools:master Sep 24, 2025
90 of 91 checks passed
@wing328 wing328 added this to the 7.16.0 milestone Sep 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG][jaxrs-cxf] Wrong imports (io.swagger.annotations)

3 participants