Skip to content

[rust] Fixed discriminator causing duplicate enum variants#20711

Merged
wing328 merged 2 commits into
OpenAPITools:masterfrom
ranger-ross:fix-discrimator
Feb 23, 2025
Merged

[rust] Fixed discriminator causing duplicate enum variants#20711
wing328 merged 2 commits into
OpenAPITools:masterfrom
ranger-ross:fix-discrimator

Conversation

@ranger-ross

Copy link
Copy Markdown
Contributor

This is one of the issues for #20500.

The issue is that when a discriminator has multiple "types" that refer to the same schema.
ie.

discriminator:
   propertyName: type
   mappings:
      student: '#/components/schemas/Person'
      teacher: '#/components/schemas/Person'
      car: '#/components/schemas/Vehicle'

would previously generate an enum like

enum Foo {
  #[serde(rename="student")]
  Person { ... }
  #[serde(rename="teacher")]
  Person { ... }
  #[serde(rename="car")]
  Vehicle { ... }
}

This is a compiler error because there are duplicate enum variants.

The fix in this PR changes the generation to add the tag as a suffix to the variant name. (only if there are duplicates detected)

enum Foo {
  #[serde(rename="student")]
  PersonStudent { ... }
  #[serde(rename="teacher")]
  PersonTeacher { ... }
  #[serde(rename="car")]
  Vehicle { ... }
}
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 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.

cc: @frol @farcaller @richardwhiuk @paladinzh @jacob-pro

@wing328 wing328 merged commit 670e9d7 into OpenAPITools:master Feb 23, 2025
@ranger-ross ranger-ross deleted the fix-discrimator branch February 23, 2025 12:59
@wing328 wing328 added this to the 7.12.0 milestone Feb 27, 2025
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.

2 participants