Skip to content

Conversation

@ThomasVille
Copy link
Contributor

@ThomasVille ThomasVille commented Dec 2, 2025

Fixes #22344.

When a discriminator is specified for oneOf and the field is also a required field in one of the possible variants of oneOf,
set a default value for that field, otherwise serde will fail to parse it because it removes the tag internally.

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 || exit
    ./bin/generate-samples.sh ./bin/configs/*.yaml || exit
    ./bin/utils/export_docs_generators.sh || exit
    
    (For Windows users, please run the script in WSL)
    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 solves a reported issue, reference it using GitHub's linking syntax (e.g., having "fixes #123" present in the PR description)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@ThomasVille
Copy link
Contributor Author

I just noticed that my code injects discriminator fields that were not present before in some samples like in samples/client/others/rust/hyper/oneOf-reuseRef/src/models/apple.rs. I see there's some code to remove the discriminator and I thought it didn't work, but it looks like it does work but not always...

@ThomasVille
Copy link
Contributor Author

It's even worse, in the oneOf-reuseRef sample, the Apple struct doesn't even have the fruitType field, so we add the field to the client even though it doesn't exist in the spec. I'll remove the code that adds the field that I took from https://github.com/OpenAPITools/openapi-generator/pull/20336/files.

@ThomasVille
Copy link
Contributor Author

Weird, the CI fails on tests unrelated to my changes:

Error:    Run 1: TypescriptAngularArrayAndObjectIntegrationTest.generatesCorrectDirectoryStructure:65->AbstractIntegrationTest.generatesCorrectDirectoryStructure:70 [Directory content of '/home/runner/work/openapi-generator/openapi-generator/modules/openapi-generator/target/test-classes/integrationtests/typescript/array-and-object-expected/model' and '/home/runner/work/openapi-generator/openapi-generator/modules/openapi-generator/target/test-classes/integrationtests/typescript/array-and-object-result/model' differ.] 
Error:    Run 2: TypescriptAngularArrayAndObjectIntegrationTest.generatesCorrectDirectoryStructure:65->AbstractIntegrationTest.generatesCorrectDirectoryStructure:70 [Directory content of '/home/runner/work/openapi-generator/openapi-generator/modules/openapi-generator/target/test-classes/integrationtests/typescript/array-and-object-expected/model' and '/home/runner/work/openapi-generator/openapi-generator/modules/openapi-generator/target/test-classes/integrationtests/typescript/array-and-object-result/model' differ.] 
Error:    Run 3: TypescriptAngularArrayAndObjectIntegrationTest.generatesCorrectDirectoryStructure:65->AbstractIntegrationTest.generatesCorrectDirectoryStructure:70 [Directory content of '/home/runner/work/openapi-generator/openapi-generator/modules/openapi-generator/target/test-classes/integrationtests/typescript/array-and-object-expected/model' and '/home/runner/work/openapi-generator/openapi-generator/modules/openapi-generator/target/test-classes/integrationtests/typescript/array-and-object-result/model' differ.] 

@ThomasVille
Copy link
Contributor Author

@frol @farcaller @richardwhiuk @paladinzh @jacob-pro @dsteeley Hi, I opened this PR to fix #22344. The CI fails but it seems unrelated to my changes. Can anyone help me figure out the issue?

@dsteeley
Copy link
Contributor

dsteeley commented Dec 5, 2025

@ThomasVille, unsure on the failure but does look to be impacting other PRs so potentially unrelated to your changes here.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG][RUST] #[serde(tag)] conflicts with discriminator property in nested objects

2 participants