-
-
Notifications
You must be signed in to change notification settings - Fork 7.7k
fix(java): fix oneOf interface ignoring useJakartaEe for @Generated a… #24893
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
anupamchaubey
wants to merge
1
commit into
OpenAPITools:master
Choose a base branch
from
anupamchaubey:fix-java-oneof-generated-annotation
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -603,6 +603,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs) | |
| objsValue.put("classname", cm.classname); | ||
| objsValue.putAll(additionalProperties); | ||
| objs.put(cm.name, objsValue); | ||
| objsValue.put("javaxPackage", additionalProperties.getOrDefault("javaxPackage", "javax")); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i don't think default codegen should store java specified values (e.g. javaxPackage). can this be fix in java abstract code gen instead? |
||
| } | ||
|
|
||
| // Gather data from all the models that contain oneOf into OneOfImplementorAdditionalData classes | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P2: This line is redundant:
objsValue.putAll(additionalProperties)two lines above already copiesjavaxPackageintoobjsValuefor Java generators, becauseapplyJavaxPackage()/applyJakartaPackage()write it intoadditionalPropertiesduringprocessOpts(), beforepostProcessAllModels()runs. The newputoverwrites the same key with the same value, so it cannot change the template context for Java. If the oneOf interface was still renderingjavax, this line does not fix it — the real cause is likely how the oneOf template consumes the model map entries, not a missing context property. Verify the actual rendering path or remove this no-op.Prompt for AI agents