[JAVA] fix: oneOf generates incorrect model for primitive types #16834
Conversation
This file contains 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
wing328
reviewed
Oct 16, 2023
| @@ -0,0 +1,7 @@ | |||
| generatorName: java | |||
| outputDir: samples/client/echo_api/java/okhttp-gson-oneOf | |||
There was a problem hiding this comment.
what about putting it in samples/client/others/java/okhttp-gson-oneOf instead as the spec has nothing to do with echo api?
Also can you please add the new sample folder to .github/workflows/samples-java-client-jdk11.yaml as well?
There was a problem hiding this comment.
Both things are changed :)
martin-mfg
force-pushed
the
primitive-oneof-2
branch
from
98940bb
to
0e1e1ca
Compare
martin-mfg
force-pushed
the
primitive-oneof-2
branch
from
0e1e1ca
to
a462c91
Compare
wing328
reviewed
Oct 16, 2023
| @@ -7248,7 +7248,7 @@ protected void addBodyModelSchema(CodegenParameter codegenParameter, String name | |||
| codegenParameter.description = codegenModelDescription; | |||
| imports.add(codegenParameter.baseType); | |||
|
|
|||
| if (codegenProperty.complexType != null) { | |||
| if (codegenProperty.complexType != null && codegenProperty.getComposedSchemas() == null) { | |||
There was a problem hiding this comment.
cc @OpenAPITools/generator-core-team
aniska123
added a commit
to aniska123/openapi-generator
that referenced
this pull request
Oct 20, 2023
fixed the issue OpenAPITools#16834
AlanCitrix
pushed a commit
to AlanCitrix/openapi-generator
that referenced
this pull request
Oct 26, 2023
…APITools#16834) * generate samples * try fix * add new sample for fixed case * also improve native library Other libraries don't need fixes. * add oneOf_twoPrimitives.yaml * generate samples * resolve comment
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.
fix #10450
Fix issues in generated code for oneOf with multiple identical subtypes. e.g.
I fixed the
nativeandokhttp-gsonlibraries. All other Java libraries don't need fixes.Btw, using
allOfinstead ofoneOfin the example above still causes problems.PR checklist
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.
master(upcoming 7.1.0 minor 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)