Skip to content

refactor: add utility methods for allOf, oneOf and anyOf CodegenModel checks - #24608

Merged
wing328 merged 1 commit into
OpenAPITools:masterfrom
Mattias-Sehlstedt:codegen-model-utils
Aug 5, 2026
Merged

refactor: add utility methods for allOf, oneOf and anyOf CodegenModel checks#24608
wing328 merged 1 commit into
OpenAPITools:masterfrom
Mattias-Sehlstedt:codegen-model-utils

Conversation

@Mattias-Sehlstedt

@Mattias-Sehlstedt Mattias-Sehlstedt commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

Similar to the changes done in #23608 where the available util methods for Schema was used further. This PR introduces and uses the same structure but for CodegenModel and handling the presence of oneOf/anyOf/allOf.

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

Adds ModelUtils helpers to check allOf/oneOf/anyOf on CodegenModel, and refactors generators to use them. This unifies composed schema checks and reduces null/empty guard code without changing behavior.

  • Refactors
    • Added ModelUtils.hasAllOf(CodegenModel), ModelUtils.hasOneOf(CodegenModel), ModelUtils.hasAnyOf(CodegenModel).
    • Replaced manual checks across generators: Go (AbstractGoCodegen, GoClientCodegen), Python (AbstractPythonCodegen, AbstractPythonPydanticV1Codegen, PythonClientCodegen), Rust, C# (CSharpClientCodegen, CSharpReducedClientCodegen), Java (JavaClientCodegen), Kotlin (KotlinServerCodegen), OCaml, PowerShell, Protobuf, and PlantUML.
    • Cleaned up spots where nullability, imports, and validators depend on oneOf/anyOf presence. No functional changes intended.

Written for commit e73096d. 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.

No issues found across 15 files

Re-trigger cubic

@wing328
wing328 merged commit 107b07d into OpenAPITools:master Aug 5, 2026
14 of 15 checks passed
@wing328 wing328 added the Enhancement: Code Cleanup General refactoring, removal of deprecated things, commenting, etc. label Aug 5, 2026
@wing328 wing328 added this to the 7.25.0 milestone Aug 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Enhancement: Code Cleanup General refactoring, removal of deprecated things, commenting, etc.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants