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 not processing enums in cpp-pistache-server #8886

Merged
merged 3 commits into from
Mar 9, 2021

Conversation

mfyuce
Copy link
Contributor

@mfyuce mfyuce commented Mar 4, 2021

Defining a reusable enum as a component schema results in a class that does not include enum values. Following changes are made:

  • override 'toEnumValue' in 'AbstractCppCodegen'
  • modify model templates for the 'cpp-pistache-server' project

Fixes #1317

PR checklist

  • [ x] Read the contribution guidelines.
  • [ x] 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.
  • [x ] Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh
    ./bin/utils/export_docs_generators.sh
    
    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 ./bin/generate-samples.sh bin/configs/java*.
    For Windows users, please run the script in Git BASH.
  • [ x] File the PR against the correct branch: master, 5.1.x, 6.0.x
  • [ 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.

@ravinikam (2017/07) @stkrwork (2017/07) @etherealjoy (2018/02) @MartinDelille (2018/03) @muttleyxd (2019/08)

Defining a reusable enum as a component schema results in an empty
class. Following changes are made:

- activate 'postProcessModelsEnum' in 'AbstractCppCodegen'
- modify model templates for the 'cpp-pistache-server' project

As 'postProcessModelsEnum' is now available in the 'AbstactCppCodegen'
the 'enumVars' variables are now available in mustache templates for all
cpp based code generators.

As the 'AbstractCppCodegen' was touched all cpp based
samples were updated.
@wing328
Copy link
Member

wing328 commented Mar 6, 2021

@mfyuce thanks for the PR. Is it correct to say that you've tested these changes locally and it works for your use cases?

@etherealjoy
Copy link
Contributor

I tried it and it seems OK.
There is a limitation still, in case an enum is part of the class it/nested inside it, is not generated.
But this can be handled later in a future PR.

@mfyuce
Copy link
Contributor Author

mfyuce commented Mar 7, 2021

Hi @wing328,

Is it correct to say that you've tested these changes locally and it works for your use cases?

Yes, I did the tests for our use cases and it is usable for us.

But, after server generation, we needed to do a bit manuel modification and then we were ok (delete all "EnumContainer"s, rename all "EnumContainer_anyOf"s to "EnumContainer").

May be @etherealjoy is telling about the same situation.

There is a limitation still, in case an enum is part of the class it/nested inside it, is not generated.
But this can be handled later in a future PR.

I checked qt server generation output and saw that the same situation is there, so, I thought it is a feature or sth...

@wing328
Copy link
Member

wing328 commented Mar 9, 2021

CI failure not related to this change.

@wing328 wing328 merged commit 86e418d into OpenAPITools:master Mar 9, 2021
@wing328 wing328 added this to the 5.1.0 milestone Mar 9, 2021
@wing328
Copy link
Member

wing328 commented Mar 22, 2021

@mfyuce thanks for the PR, which has been included in the v5.1.0 release: https://twitter.com/oas_generator/status/1373636654024380423

@mfyuce
Copy link
Contributor Author

mfyuce commented Mar 22, 2021

@wing328 thanks to you and to the team for the great work!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[cpp-pistache-server] Enumerations not generated
4 participants