Skip to content

[JAVA] fix: oneOf generates incorrect model for primitive types#16834

Merged
wing328 merged 8 commits intoOpenAPITools:masterfrom
martin-mfg:primitive-oneof-2
Oct 16, 2023
Merged

[JAVA] fix: oneOf generates incorrect model for primitive types#16834
wing328 merged 8 commits intoOpenAPITools:masterfrom
martin-mfg:primitive-oneof-2

Conversation

@martin-mfg
Copy link
Contributor

fix #10450

Fix issues in generated code for oneOf with multiple identical subtypes. e.g.

oneOf:
  - type: string
    format: ipv4
  - type: string
    format: ipv6

I fixed the native and okhttp-gson libraries. All other Java libraries don't need fixes.

Btw, using allOf instead of oneOf in the example above still causes problems.

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
    
    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.
  • File the PR against the correct branch: master (upcoming 7.1.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)

@@ -0,0 +1,7 @@
generatorName: java
outputDir: samples/client/echo_api/java/okhttp-gson-oneOf
Copy link
Member

Choose a reason for hiding this comment

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

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Both things are changed :)

imports.add(codegenParameter.baseType);

if (codegenProperty.complexType != null) {
if (codegenProperty.complexType != null && codegenProperty.getComposedSchemas() == null) {
Copy link
Member

Choose a reason for hiding this comment

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

cc @OpenAPITools/generator-core-team

@wing328 wing328 merged commit b6db4f7 into OpenAPITools:master Oct 16, 2023
aniska123 added a commit to aniska123/openapi-generator that referenced this pull request Oct 20, 2023
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.

[BUG] [JAVA] oneOf generates incorrect model for primitive types

2 participants