fix(jaxrs): correct add/remove methods for JsonNullable<List<T>> fields#23258
Open
TheNevim wants to merge 1 commit intoOpenAPITools:masterfrom
Open
fix(jaxrs): correct add/remove methods for JsonNullable<List<T>> fields#23258TheNevim wants to merge 1 commit intoOpenAPITools:masterfrom
TheNevim wants to merge 1 commit intoOpenAPITools:masterfrom
Conversation
Contributor
There was a problem hiding this comment.
1 issue found across 1 file
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/resources/JavaJaxRS/spec/pojo.mustache">
<violation number="1" location="modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache:177">
P1: JsonNullable collection/map helpers incorrectly assume `isPresent()` implies non-null wrapped container, leading to NPE when wrapper is present with null (`JsonNullable.of(null)`).</violation>
</file>
Since this is your first cubic review, here's how it works:
- cubic automatically reviews your code and comments on bugs and improvements
- Teach cubic by replying to its comments. cubic learns from your replies and gets better over time
- Add one-off context when rerunning by tagging
@cubic-dev-aiwith guidance or docs links (includingllms.txt) - Ask questions if you need clarification on any suggestion
Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.
| {{#isArray}} | ||
| public {{classname}} add{{nameInPascalCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { | ||
| {{#vendorExtensions.x-is-jackson-optional-nullable}} | ||
| if (this.{{name}} == null || !this.{{name}}.isPresent()) { |
Contributor
There was a problem hiding this comment.
P1: JsonNullable collection/map helpers incorrectly assume isPresent() implies non-null wrapped container, leading to NPE when wrapper is present with null (JsonNullable.of(null)).
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache, line 177:
<comment>JsonNullable collection/map helpers incorrectly assume `isPresent()` implies non-null wrapped container, leading to NPE when wrapper is present with null (`JsonNullable.of(null)`).</comment>
<file context>
@@ -173,36 +173,84 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
{{#isArray}}
public {{classname}} add{{nameInPascalCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
+ {{#vendorExtensions.x-is-jackson-optional-nullable}}
+ if (this.{{name}} == null || !this.{{name}}.isPresent()) {
+ this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}new {{#uniqueItems}}LinkedHashSet{{/uniqueItems}}{{^uniqueItems}}ArrayList{{/uniqueItems}}<>(){{/defaultValue}});
+ }
</file context>
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.
Summary
This PR fixes the incorrect implementation of add and remove helper methods generated for JsonNullable<List> fields in JAX-RS models.
The generated code incorrectly treated the field as an ArrayList, while the actual type is JsonNullable<List>. This resulted in compilation errors in the generated models.
The fix updates the generated methods to correctly handle the JsonNullable wrapper and operate on the underlying list.
Changes
Result
Generated models now compile correctly and properly support add and remove operations for JsonNullable<List> fields.
Related Issue
Fixes #23251
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)@bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @martin-mfg (2023/08)
Summary by cubic
Fixes the generated add/remove/put helpers for
JsonNullable<List<T>>andJsonNullable<Map<String, T>>in JAX-RS models so they compile and correctly modify the underlying collections.JavaJaxRSPOJO template to initialize viaJsonNullable.of(...), check.isPresent(), and mutate with.get()for optional-nullable arrays and maps.JsonNullablefields.Written for commit e673d7c. Summary will update on new commits.