Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix inheritance with modelPrefix #3151

Merged
merged 2 commits into from
Jun 25, 2019
Merged

Fix inheritance with modelPrefix #3151

merged 2 commits into from
Jun 25, 2019

Conversation

Zomzog
Copy link
Contributor

@Zomzog Zomzog commented Jun 13, 2019

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  • Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

Check if inheritance parent exists with refName and not modelName.

I've done it on DefaultCodegen so it will impact all generators.

Fix #3150

@wing328
@jimschubert
@cbornet
@ackintosh
@jmini
@etherealjoy

@ZwoCa
Copy link

ZwoCa commented Jun 17, 2019

@Zomzog Thank you, I just freshly built from your branch and can confirm this solves the problem.

Unfortunately, I'm not sure what's up with CircleCI. Seems like there was a problem unpacking some pre-requirements for the Hashkell test suite.

Assert.assertEquals(codegenModel.vars.size(), 1);
}
@Test
public void modelWithSuffuxDoNotContainInheritedVars() {

Choose a reason for hiding this comment

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

There is a typo: ”Suffux” vs. ”Suffix”

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fix thanks

@wing328
Copy link
Member

wing328 commented Jun 25, 2019

cc @OpenAPITools/generator-core-team

Copy link
Member

@wing328 wing328 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 01f991a into OpenAPITools:master Jun 25, 2019
@wing328 wing328 added this to the 4.0.3 milestone Jun 25, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Model name prefix brakes model inheritance
4 participants