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.

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

Fix oneOf merging, upgrade dependencies #16992

Merged
merged 3 commits into from
Nov 7, 2023

Conversation

martin-mfg
Copy link
Contributor

fix #16710

The problem was that in mergeProperties, instances of Schema were copied by reference. So later changes to a sub-schema of one of the models affected other models as well.

I had to upgrade swagger-parser so that I could use AnnotationsUtils.clone. The new swagger-parser version included a newer jackson-related dependency, so I further had to upgrade some other dependencies so that the transitive jackson-related dependencies were again compatible with each other.

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 
    ./bin/generate-samples.sh ./bin/configs/*.yaml
    ./bin/utils/export_docs_generators.sh
    
    (For Windows users, please run the script in Git BASH)
    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.1.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)

@wing328
Copy link
Member

wing328 commented Nov 7, 2023

LGTM

cc @OpenAPITools/generator-core-team

@wing328 wing328 added this to the 7.1.0 milestone Nov 7, 2023
@wing328 wing328 merged commit c301004 into OpenAPITools:master Nov 7, 2023
12 checks passed
@wing328 wing328 changed the title fix oneOf merging, upgrade dependencies Fix oneOf merging, upgrade dependencies Nov 7, 2023
dabdirb added a commit to dabdirb/openapi-generator that referenced this pull request Nov 13, 2023
wing328 pushed a commit that referenced this pull request Jan 5, 2024
* fix  #16797 and #15796 spring child constructor missing parent params

* root cause and update the DefaultCodegen.java to add missing property when with multi inheritance

* rollback SpringCodegen.java

* update samples

* rollback with master cause #16992 fixed this issue too

* still using orignal design

* catchup master

* catchup master

* catchup master

* fix

* add tests

---------

Co-authored-by: dabdirb <dabdirb@gmail.com>
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] [Java] schema with oneOfs will generated model-code where first entry will match all others
2 participants