Skip to content

[core] Extract InlineModelResolver's repeated inline-model step into a helper - #25554

Open
ChihweiLHBird wants to merge 1 commit into
OpenAPITools:masterfrom
ChihweiLHBird:refactor/inline-model-resolver-extract-inline-model
Open

ChihweiLHBird wants to merge 1 commit into
OpenAPITools:masterfrom
ChihweiLHBird:refactor/inline-model-resolver-extract-inline-model

Conversation

@ChihweiLHBird

@ChihweiLHBird ChihweiLHBird commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

Refactor of InlineModelResolver; generated output is unchanged.

Eight call sites repeated the same steps: resolve a model name, recurse with gatherInlineModels, and move the schema to the components with makeSchemaInComponents when isModelNeeded says so. They now call one private extractInlineModel helper, which keeps the call order. The allOf site is left as is because it also depends on REFACTOR_ALLOF_INLINE_SCHEMAS.

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

Refactors InlineModelResolver by extracting the repeated sequence of resolving a model name, recursing with gatherInlineModels, and moving the schema to components when needed into a single private extractInlineModel helper. This removes duplication across eight call sites without changing the generated output.

The helper returns the new $ref schema, or null when the schema stays inline, so callers check for null instead of calling isModelNeeded themselves. The allOf branch is left as is because it also depends on REFACTOR_ALLOF_INLINE_SCHEMAS. The helper keeps the original call order, which matters because resolveModelName does not reserve the name it returns.

Written for commit b71155d. Summary will update on new commits.

View guided diff

@ChihweiLHBird
ChihweiLHBird force-pushed the refactor/inline-model-resolver-extract-inline-model branch 2 times, most recently from d1fadb9 to 88f729a Compare November 10, 2026 05:56
@ChihweiLHBird
ChihweiLHBird force-pushed the refactor/inline-model-resolver-extract-inline-model branch 6 times, most recently from b70e969 to 506a8de Compare November 19, 2026 17:36
…a helper

Signed-off-by: Zhiwei Liang <zhiwei.liang@zliang.me>
@ChihweiLHBird
ChihweiLHBird force-pushed the refactor/inline-model-resolver-extract-inline-model branch from 506a8de to b71155d Compare November 20, 2026 07:48

This branch has not been deployed

No deployments
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