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

[Java][Go] Unalias schema in getTypeDeclaration when not generating model for alias #4527

Merged
merged 3 commits into from
Nov 21, 2019

Conversation

zippolyte
Copy link
Contributor

This is my attempt to fix #4362 for the two languages that I'm having this issue with.
What do you think ?

@bbdouglas @sreeshas @jfiala @lukoyanov @cbornet @jeff9finger @karismann @Zomzog @lwlee2608

@antihax @bvwells @grokify @kemokemo @bkabrda

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./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.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

@wing328
Copy link
Member

wing328 commented Nov 20, 2019

@zippolyte thanks for the PR. I think it's better to fix it in the DefaultCodegen. I'll try to fix it later this week.

@@ -278,10 +278,16 @@ public String getTypeDeclaration(Schema p) {
if (ModelUtils.isArraySchema(p)) {
ArraySchema ap = (ArraySchema) p;
Schema inner = ap.getItems();
return "[]" + getTypeDeclaration(inner);
if (ModelUtils.isGenerateAliasAsModel())
Copy link
Member

Choose a reason for hiding this comment

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

@zippolyte I don't think you need ModelUtils.isGenerateAliasAsModel() as unaliasSchema has already taken that into account:

@wing328
Copy link
Member

wing328 commented Nov 20, 2019

UPDATE: I've reviewed your fix again and I think it's the right approach. I've left a comment suggesting a minor change. Please review when you've time. Thanks again for the PR.

@zippolyte
Copy link
Contributor Author

Indeed it seems I don't need that after all. Thanks for your review, updating.

Copy link
Contributor

@bkabrda bkabrda left a comment

Choose a reason for hiding this comment

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

This looks perfect, 👍 from me.

@wing328
Copy link
Member

wing328 commented Nov 21, 2019

@zippolyte thanks for the PR, which has been merged into master. I've filed #4563 to track the fixes for other generators.

@zippolyte zippolyte deleted the hippo/unalias branch November 21, 2019 08:59
@wing328 wing328 added this to the 4.2.2 milestone Dec 2, 2019
@wing328
Copy link
Member

wing328 commented Dec 2, 2019

@zippolyte thanks for the PR, which has been included in the v4.2.2 release: https://twitter.com/oas_generator/status/1201432648544972800

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.

[BUG][Java][Go-experimental] Referenced schema for array type badly generated
3 participants