[java][feign] Fix model combining properties and additional properties#19713
Merged
wing328 merged 1 commit intoOpenAPITools:masterfrom Feb 14, 2025
Merged
[java][feign] Fix model combining properties and additional properties#19713wing328 merged 1 commit intoOpenAPITools:masterfrom
wing328 merged 1 commit intoOpenAPITools:masterfrom
Conversation
This was referenced Sep 29, 2024
martin-mfg
approved these changes
Oct 15, 2024
7fd0824 to
cf99d83
Compare
|
What's needed to get this merged? |
Contributor
Hi, same as in this comment - @wing328 needs to check and merge this PR. |
cf99d83 to
e11496b
Compare
4c25606 to
eee08ff
Compare
Member
|
@JoaoBrlt when you've time this week, can you please PM me via Slack to go over your PRs and get the merged? |
eee08ff to
acf4b14
Compare
Member
|
@JoaoBrlt thanks again for the PR. When you've time, can you please resolve the merge conflicts and fix the CI failure? |
acf4b14 to
523bc78
Compare
Contributor
Author
|
Hi @wing328 ! 👋 No problem, I've just rebased the branch to fix the merge conflicts and the CI failure. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When
additionalPropertiesis set totrue, use anadditionalPropertiesattribute and@JsonAnySetterand@JsonAnyGetterannotations instead of extendingHashMap.This fixes the issue #17361 only for the
feignlibrary.I also created the following pull requests to fix the same issue for other libraries:
resttemplatelibrary.webclientlibrary.PR checklist
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.
master(upcoming7.x.0minor release - breaking changes with fallbacks),8.0.x(breaking changes without fallbacks)@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