Created by: impl
There are two ways that discriminators can be used: with oneOf or anyOf, explicitly, alongside the definition of their respective schemas; or with allOf, in which case a discriminator defined in a parent schema may be implicitly inherited by any other schema that includes it.
The code generator correctly handles both of those cases, except when an explicit ("closed") oneOf is used directly inside an unrelated allOf composite schema. In this situation, the allOf leaks into the discriminator mappings for the oneOf schema.
This change checks whether a schema for which a discriminator is being created is a oneOf/anyOf and skips the "open" allOf check that follows if so.
Without this change, in the included test cases, the discriminator mapping would also include Pet.
This is particularly important for generators that support useOneOfDiscriminatorLookup, as they will try to assign to fields of the oneOf schema type that don't exist.
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: 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./mvnw clean package ./bin/generate-samples.sh ./bin/utils/export_docs_generators.sh./bin/generate-samples.sh bin/configs/java*. For Windows users, please run the script in Git BASH. -
File the PR against the correct branch: master(5.3.0),6.0.x -
If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.