[core][typescript][perl] Ensure model.parent is also added to model.allParents with multiple inheritance #5182
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
👍 Thanks for opening this issue! The team will review the labels and make any necessary changes. |
amakhrov
commented
Jan 31, 2020
| @@ -528,9 +528,31 @@ public void testAllOfRequired() { | |||
| Schema child = openAPI.getComponents().getSchemas().get("clubForCreation"); | |||
| codegen.setOpenAPI(openAPI); | |||
| CodegenModel childModel = codegen.fromModel("clubForCreation", child); | |||
| showVars(childModel); | |||
| Assert.assertEquals(getRequiredVars(childModel), Collections.singletonList("name")); | |||
There was a problem hiding this comment.
not sure how we ended up here having a test without any assertions :)
macjohnny
approved these changes
Feb 3, 2020
modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
Outdated
Show resolved
Hide resolved
|
@amakhrov thanks for the PR, which looks good to me. Can you please resolve the merge conflicts when you've time? |
… ref and no own props
…heritance is supported
amakhrov
force-pushed
the
single-refed-parent
branch
from
3bb637f
to
b25bfeb
Compare
|
@wing328 rebased from the latest |
MikailBag
pushed a commit
to MikailBag/openapi-generator
that referenced
this pull request
Mar 23, 2020
…llParents with multiple inheritance (OpenAPITools#5182) * Add real assertions in DefaultCodegenTest.java testAllOfXXX methods * Add test to DefaultCodegenTest for an allOf composition with a single ref and no own props * Ensure model.parent is also added to model.allParents when multipleInheritance is supported * Cleanup: remove LOGGER.debug, renamed refedParentNames to refedWithoutDiscriminator
|
@amakhrov thanks for the PR, which has been included in the 4.3.0 release: https://twitter.com/oas_generator/status/1243455743937789952 |
5 tasks
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #4770
Turned out that generator still supports a deprecated inheritance case with a single oneOf ref without a discriminator. The behavior in this case is to treat it as inheritance rather than composition.
Now, the problem is that even though
model.parentis properly populated with the referenced model in this situation,model.allParents(used with multiple inheritance) stays empty. It looks like a bug in the implementation rather than intended behavior - but of course correct me if I'm wrong.This PR makes sure the same logic supporting the deprecated inheritance case applies both to
parentandallParents.I also cleaned up a few tests for DefaultCodegen that are related to
allOfcomposition - just to give me a bit more safety assurance of the change (better than nothing)PR checklist
./bin/(or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run./bin/{LANG}-petstore.sh,./bin/openapi3/{LANG}-petstore.shif updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).master,4.3.x,5.0.x. Default:master.Typescript generators family use multiple inheritance, hence copying them here:
@TiFu @taxpon @sebastianhaas @kenisteward @Vrolijkx @macjohnny @nicokoenig @topce @akehir @petejohansonxo
And also Perl (another representative of multiple inheritance supporting generator):
@wing328 @yue9944882