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][resttemplate] Fix model combining properties and additional properties #19706

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

JoaoBrlt
Copy link

@JoaoBrlt JoaoBrlt commented Sep 28, 2024

When additionalProperties is set to true, use an additionalProperties attribute and @JsonAnySetter and @JsonAnyGetter annotations instead of extending HashMap.

This fixes the issue #17361 only for the resttemplate library.

I also created the following pull requests to fix the same issue for other libraries:

PR checklist

  • Read the contribution guidelines.
  • 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.
  • Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh ./bin/configs/*.yaml
    ./bin/utils/export_docs_generators.sh
    
    (For Windows users, please run the script in Git BASH)
    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*.
    IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
  • File the PR against the correct branch: master (upcoming 7.x.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @martin-mfg (2023/08) @wing328

@martin-mfg
Copy link
Contributor

Hi @JoaoBrlt, thanks for the PRs! They look really good. 👍
I'll approve all 3 of them. May I ask you to resolve the conflicts with master?

@JoaoBrlt
Copy link
Author

Hey @martin-mfg! 👋 Thanks for approving the pull requests. Yeah, no problem. I'll take a look right now.

@JoaoBrlt
Copy link
Author

Hey @martin-mfg! I updated the pull requests to resolve the conflicts with the master branch. ✔️ I redid the modifications using the latest Mustache templates to make sure to benefit from the latest changes. Don't hesitate to tell me if there's any issue.

@JoaoBrlt
Copy link
Author

Hey @martin-mfg @wing328! 👋 Do you think we could merge these pull requests for the next version? This would be very useful for my current project. Indeed, we have to manually patch the OpenAPI specs to fix the code generation. I would be happy to help if needed. 😄

@martin-mfg
Copy link
Contributor

Hey @martin-mfg @wing328! 👋 Do you think we could merge these pull requests for the next version? This would be very useful for my current project. Indeed, we have to manually patch the OpenAPI specs to fix the code generation. I would be happy to help if needed. 😄

just for your info: I've done everything I could by approving your PR. :) Now it's up to @wing328 to merge it, because I don't have merge permissions.

@JoaoBrlt
Copy link
Author

Hi @wing328 ! 👋 I just rebased the branch to avoid conflicts. Do you think we could merge this pull request? It should be a quick win and it would be very useful for my current project.

@wing328
Copy link
Member

wing328 commented Nov 22, 2024

@JoaoBrlt thanks for the PR

please ping me via Slack for a quick chat when you've time: https://join.slack.com/t/openapi-generator/shared_invite/zt-2uoef5v0g-XGwo8~2oJ3EoziDSO1CmdQ

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.

3 participants