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(sample-gen): first oneOf or anyOf should be combined with schema #6775

Merged
merged 3 commits into from
Jan 7, 2021

Conversation

mathis-m
Copy link
Contributor

@mathis-m mathis-m commented Jan 7, 2021

Description

In case of oneOf or anyOf the schema itself is ignored. The first oneOf or anyOf schema will be used for example generation.
Now, the first oneOf or anyOf is combined with the schema to generate samples.

Motivation and Context

Fixes #6773

How Has This Been Tested?

Unit Tests added to ensure combination of anyOf and oneOf with schema.

Screenshots (if appropriate):

Checklist

My PR contains...

  • No code changes (src/ is unmodified: changes to documentation, CI, metadata, etc.)
  • Dependency changes (any modification to dependencies in package.json)
  • Bug fixes (non-breaking change which fixes an issue)
  • Improvements (misc. changes to existing features)
  • Features (non-breaking change which adds functionality)

My changes...

  • are breaking changes to a public API (config options, System API, major UI change, etc).
  • are breaking changes to a private API (Redux, component props, utility functions, etc.).
  • are breaking changes to a developer API (npm script behavior changes, new dev system dependencies, etc).
  • are not breaking changes.

Documentation

  • My changes do not require a change to the project documentation.
  • My changes require a change to the project documentation.
  • If yes to above: I have updated the documentation accordingly.

Automated tests

  • My changes can not or do not need to be tested.
  • My changes can and should be tested by unit and/or integration tests.
  • If yes to above: I have added tests to cover my changes.
  • If yes to above: I have taken care to cover edge cases in my tests.
  • All new and existing tests passed.

when there was oneOf or anyOf defined it just used the first schema of it to generate the samples.
Now, the first oneOf or anyOf is combined with the schema to generate samples.
@mathis-m mathis-m force-pushed the bug/6773 branch 2 times, most recently from 40d41a4 to 2808ee4 Compare January 7, 2021 11:58
@tim-lai tim-lai merged commit 0f541a1 into swagger-api:master Jan 7, 2021
@tim-lai
Copy link
Contributor

tim-lai commented Jan 7, 2021

@mathis-m PR merged! Thanks for the contribution!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Only oneOf or anyOf is rendered in example. Definitions on the schema itself are ignored
2 participants