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 inheritance with modelPrefix #3151

Merged
merged 2 commits into from Jun 25, 2019

Conversation

Projects
None yet
4 participants
@Zomzog
Copy link
Contributor

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

This comment has been minimized.

Copy link

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() {

This comment has been minimized.

Copy link
@tkalliom

tkalliom Jun 19, 2019

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

This comment has been minimized.

Copy link
@Zomzog

Zomzog Jun 19, 2019

Author Contributor

Fix thanks

@wing328

This comment has been minimized.

Copy link
Member

commented Jun 25, 2019

@wing328
Copy link
Member

left a comment

LGTM

@wing328 wing328 merged commit 01f991a into OpenAPITools:master Jun 25, 2019

4 checks passed

Shippable Run 8673 status is SUCCESS.
Details
ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@wing328 wing328 added this to the 4.0.3 milestone Jun 25, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.