refactor: centralize common schema checks in ModelUtils#23608
Open
Mattias-Sehlstedt wants to merge 1 commit intoOpenAPITools:masterfrom
Open
refactor: centralize common schema checks in ModelUtils#23608Mattias-Sehlstedt wants to merge 1 commit intoOpenAPITools:masterfrom
Mattias-Sehlstedt wants to merge 1 commit intoOpenAPITools:masterfrom
Conversation
Contributor
There was a problem hiding this comment.
1 issue found across 12 files
Prompt for AI agents (unresolved issues)
Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.
<file name="modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java">
<violation number="1" location="modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java:1113">
P1: Complex composed schemas can skip property normalization because this condition checks `hasEnum` instead of `hasProperties`.</violation>
</file>
Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.
ffe95a6 to
5ba7970
Compare
Member
|
thanks for the PR for refactoring the code. what about putting these functions in ModelUtils instead as some functions in ModelUtils already doing something similar? |
5ba7970 to
ce6f580
Compare
ce6f580 to
79df5f5
Compare
Contributor
Author
|
@wing328 Good suggestion, had missed that they do basically the same. I have instead moved everything into |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a
SchemaUtilsclass with common schema operations. Improves readability and makes the if-cases easier to read as the method name clearly highlights what is checked.PR checklist
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.
master(upcoming7.x.0minor release - breaking changes with fallbacks),8.0.x(breaking changes without fallbacks)"fixes #123"present in the PR description)Summary by cubic
Centralizes schema checks in
ModelUtilsand refactors generators/utilities to use them for consistent, clearer logic. No functional changes intended.org.openapitools.codegen.utils.ModelUtils:hasAllOf,hasOneOf,hasAnyOf,hasProperties,hasEnum,isObjectTypeOAS30.DefaultCodegen,InlineModelResolver,OpenAPINormalizer, language codegens (AbstractJavaCodegen,AbstractPhpCodegen,AbstractPythonCodegen,AbstractPythonPydanticV1Codegen,CppHttplibServerCodegen,CppRestSdkClientCodegen), andOpenApiSchemaValidations.isNestedObjectand standardizedoneOf/anyOfhandling usingstd::variant.Written for commit 79df5f5. Summary will update on new commits.