Skip to content

refactor: introduce DiscriminatorUtils to separate handling of discriminator discoverability#24143

Open
Mattias-Sehlstedt wants to merge 1 commit into
OpenAPITools:masterfrom
Mattias-Sehlstedt:discriminator-utils
Open

refactor: introduce DiscriminatorUtils to separate handling of discriminator discoverability#24143
Mattias-Sehlstedt wants to merge 1 commit into
OpenAPITools:masterfrom
Mattias-Sehlstedt:discriminator-utils

Conversation

@Mattias-Sehlstedt

@Mattias-Sehlstedt Mattias-Sehlstedt commented Jun 28, 2026

Copy link
Copy Markdown
Contributor

I was working on extending the discriminator discoverability for useOneOfInterfaces in combination with enums, but I encountered that I had to duplicate my logic in several places. To make the delta of my later change smaller and more clear, I have created a PR first where I remove this duplicated logic.

Since the discriminator is a complex concept that sometimes require very specific parsing, I have also elected to move this logic into a separate DiscriminatorUtils class. This is similar to the ExamplesUtils class that already exists.

PR checklist

  • Read the contribution guidelines.
  • 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.
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

Summary by cubic

Centralized discriminator discovery and construction in DiscriminatorUtils, with DefaultCodegen delegating lookups and type/schema resolution. This removes duplicated logic, unifies oneOf/anyOf handling, and keeps behavior unchanged while preparing enum-based discriminators with useOneOfInterfaces.

  • Refactors
    • Added org.openapitools.codegen.utils.DiscriminatorUtils with recursiveGetDiscriminator, getDiscriminatorSchema, getDiscriminatorPropertyType, and a shared helper for oneOf/anyOf alternatives with a single conflicting-name warning.
    • Replaced inlined logic in org.openapitools.codegen.DefaultCodegen with calls to DiscriminatorUtils; minor comment/wording fixes (e.g., “innermost”); no functional changes.

Written for commit 52d65ec. Summary will update on new commits.

Review in cubic

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

2 issues found across 2 files

Reply with feedback, questions, or to request a fix.

Re-trigger cubic

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.

1 participant