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 allOf with a single $ref #16096

Merged
merged 2 commits into from
Jul 14, 2023
Merged

Fix allOf with a single $ref #16096

merged 2 commits into from
Jul 14, 2023

Conversation

wing328
Copy link
Member

@wing328 wing328 commented Jul 14, 2023

  • allOf with a single $ref
  • add tests

to fix #16047

FYI @OpenAPITools/generator-core-team

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/utils/export_docs_generators.sh
    
    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*.
    For Windows users, please run the script in Git BASH.
  • In case you are adding a new generator, run the following additional script :
    ./bin/utils/ensure-up-to-date
    
    Commit all changed files.
  • File the PR against the correct branch: master (6.3.0) (minor release - breaking changes with fallbacks), 7.0.x (breaking changes without fallbacks)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@wing328 wing328 added Issue: Bug Inline Schema Handling Schema contains a complex schema in items/additionalProperties/allOf/oneOf/anyOf labels Jul 14, 2023
@wing328 wing328 added this to the 7.0.0 milestone Jul 14, 2023
Copy link

@y-chan y-chan left a comment

Choose a reason for hiding this comment

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

LGTM!

@wing328 wing328 merged commit 7258b3c into master Jul 14, 2023
105 checks passed
@wing328 wing328 deleted the allof-single-ref branch July 14, 2023 11:55
@rob-spoor
Copy link

Is there an ETA on a release with this fix included? I need to migrate away from 5.1.1 because I need to add Jakarta EE support (added in v6.3.0), but then I ran into #12838 with combinations of descriptions + single-ref allOfs. This PR apparently solves that.

ReneZeidler pushed a commit to ReneZeidler/openapi-generator that referenced this pull request Jun 17, 2024
Fixes OpenAPITools#15077

The previous fix for this in OpenAPITools#16096 is incomplete because it still
generates unnecessary inline models when readOnly or
nullable is used in conjunction with other properties like
description.
This commit fixes the logic error and adds testcases.
ReneZeidler pushed a commit to ReneZeidler/openapi-generator that referenced this pull request Jun 17, 2024
Fixes OpenAPITools#15077

The previous fix for this in OpenAPITools#16096 is incomplete because it still
generates unnecessary inline models when readOnly or
nullable is used in conjunction with other properties like
description.
This commit fixes the logic error and adds testcases.
ReneZeidler added a commit to ReneZeidler/openapi-generator that referenced this pull request Jun 19, 2024
Fixes OpenAPITools#15077

The previous fix for this in OpenAPITools#16096 is incomplete because it still
generates unnecessary inline models when readOnly or
nullable is used in conjunction with other properties like
description.
This commit fixes the logic error and adds testcases.
wing328 pushed a commit that referenced this pull request Jun 19, 2024
Fixes #15077

The previous fix for this in #16096 is incomplete because it still
generates unnecessary inline models when readOnly or
nullable is used in conjunction with other properties like
description.
This commit fixes the logic error and adds testcases.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Inline Schema Handling Schema contains a complex schema in items/additionalProperties/allOf/oneOf/anyOf Issue: Bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] allOf which consists only one element(ref) are generated new model not using exist model
3 participants