refactor: replace direct enum checks with enum utility methods
Merged
MA
2d ago+98+98+01234567890123456789-68-68-01234567890123456789
Replaces reoccurring schema enum checks with util functionality from the ModelUtils.
Many locations do schema.getEnum() != null when they would most likely not accept an empty enum array. I have left these as is since it is out of scope for this change to investigate whether they would permit that scenario or not.
PR checklist
- Read the contribution guidelines.
- Run the following to build the project and update samples:
(For Windows users, please run the script in WSL)./mvnw clean package || exit ./bin/generate-samples.sh ./bin/configs/*.yaml || exit ./bin/utils/export_docs_generators.sh || exit
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
Replaces repeated inline getEnum() checks with new utility methods in ModelUtils, consolidating enum detection logic across codegen.
- Adds
isEnum(loose check: enum list present, may be empty) andhasSingleEnum;isEnumSchemaremains the strict check (non-null, non-empty). The now-unusedhasEnumhelper is removed. - Updates around 20 call sites across generators, examples, and OAS 3.1 utilities to use the helpers, preserving each site's original semantics.
- Leaves sites checking only
getEnum() != nullwhere an empty enum might not be acceptable unchanged, as verifying that is out of scope.