[JAVA-SPRING;KOTLIN-SPRING] bugfix - PagedModel<T> - default to custom DTO; allow override via import mapping and schema mapping#23599
Conversation
…generation fix(spring): enhance PagedModel handling with import mapping and schema mapping support
…can be replaced with custom one via importMapping)
There was a problem hiding this comment.
3 issues found across 5 files (changes from recent commits).
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="docs/generators/java-camel.md">
<violation number="1" location="docs/generators/java-camel.md:107">
P2: Updated docs for `substituteGenericPagedModel` omit the new `importMappings.PagedModel` override behavior, making configuration guidance inaccurate.</violation>
</file>
<file name="docs/generators/kotlin-spring.md">
<violation number="1" location="docs/generators/kotlin-spring.md:61">
P2: `substituteGenericPagedModel` docs imply `configPackage.PagedModel` is always used, but implementation supports `importMappings.PagedModel` and only falls back to generated config package model.</violation>
</file>
<file name="docs/generators/spring.md">
<violation number="1" location="docs/generators/spring.md:100">
P2: `substituteGenericPagedModel` docs are inaccurate: they imply `PagedModel<T>` is always generated in `configPackage`, but behavior can be overridden via `importMappings.PagedModel`.</violation>
</file>
Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.
There was a problem hiding this comment.
1 issue found across 1 file (changes from recent commits).
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/languages/KotlinSpringServerCodegen.java">
<violation number="1" location="modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java:1224">
P2: Using `putIfAbsent` for the derived paged-model class token can retain a conflicting existing import mapping, causing generated `pagedModelClassName` types to resolve to the wrong class.</violation>
</file>
Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.
|
cc @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03) @stefankoppier (2022/06) @e5l (2024/10) @dennisameling (2026/02) |
|
Just to clarify - actually a typical case here might be using the |
The initial implementation of the functionality had a couple of issues that I only uncovered once I tried to use it in my complex project. schemaMapping overrides of the "content" array Type was not respected by the generator leading to compilation issues. Another issue is that the native
org.springframework.data.web.PagedModelis not very easy to deserialize into. So I now default to a custom included DTO. The Dto can be replaced via importMapping with a custom one.Edit: There is another version of this PR here #23601 which contains identical fixes, but also enables usage of PagedModel as return type in spring declarative interfaces. The change is limited to a couple of modified conditionals and some tests. As always it is opt-in (which seem to be a pretty good idea seeing how I always manage to sneak in at least some bugs - this way the bugs are tightly limited to the new functionality and do not cause regressions)
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
Fixes PagedModel substitution in Spring and Kotlin generators. Defaults to a generated
configPackage.PagedModel, and now respectsschemaMappingsfor item types andimportMappings.PagedModel(including custom simple names); APIs and samples import the correct type, and docs clarify'page'metadata detection.Bug Fixes
PagedModel<com.example.external.ExternalUser>).importMappings.PagedModel; uses its simple class name (e.g.,MyPagedModel<T>) and adds the correct import.configPackage.PagedModelfor Java/Kotlin when no custom mapping; samples importorg.openapitools.configuration.PagedModel.'page'metadata detection and default/override behavior.Migration
org.springframework.data.web.PagedModel, setimportMappings.PagedModelto your class or use the generatedconfigPackage.PagedModel.schemaMappingsfor item types; API return types will reflect mapped names and imports.Written for commit cc5d628. Summary will update on new commits.