Skip to content

Default value for the type annotation attribute should be Object.class #1381

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 27, 2025
Merged

Default value for the type annotation attribute should be Object.class #1381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c3ea87
Default value for the type annotation attribute should be Object.class
Rejoice472 Sep 1, 2025
cd2d3b6
fixed test cases
Rejoice472 Sep 2, 2025
b647e20
Merge branch 'lsp4jakarta-0.2.5-integration' into bugfix/defect-580
Rejoice472 Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions ...berty/tools/intellij/lsp4jakarta/lsp4ij/codeAction/proposal/ModifyAnnotationProposal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public Change getChange() {
for (String newAttr : this.attributesToAdd) {
// don't add duplicate attributes to an annotation
if (Arrays.stream(values).noneMatch(v -> v.getName().equals(newAttr))) {
annotation.setDeclaredAttributeValue(newAttr, newDefaultExpression(annotation));
annotation.setDeclaredAttributeValue(newAttr, newDefaultExpression(annotation, newAttr));
}
}
// remove attributes
Expand All @@ -100,8 +100,26 @@ public Change getChange() {
return new Change(sourceCU.getViewProvider().getDocument(), changed);
}

private PsiAnnotationMemberValue newDefaultExpression(PsiAnnotation annotation) {
return PsiElementFactory.getInstance(annotation.getProject()).
createExpressionFromText("\"\"", annotation);
/**
* newDefaultExpression
* Add new attributes of type String or Class.
* For initial values, we use empty strings for String types and Object.class for Class types,
* since the user's intended values are unknown at this stage,
* These placeholders (e.g., name = "", type = Object.class) must be updated by the user as needed.
* when an annotation in Jakarta EE declares an attribute named type, it’s always of the form of Class<?>
*
* @param annotation
* @param attributeName
* @return
*/
private PsiAnnotationMemberValue newDefaultExpression(PsiAnnotation annotation, String attributeName) {
if ("type".equals(attributeName)) {
return PsiElementFactory.getInstance(annotation.getProject())
.createExpressionFromText("Object.class", annotation);
} else {
return PsiElementFactory.getInstance(annotation.getProject()).
createExpressionFromText("\"\"", annotation);
}

}
}
2 changes: 1 addition & 1 deletion ...java/io/openliberty/tools/intellij/lsp4jakarta/it/annotations/ResourceAnnotationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void ResourceAnnotation() throws Exception {
"{\n\n private Integer studentId;\n\n\n @Resource(shareable = true)\n " +
"private boolean isHappy;\n\n @Resource(name = \"test\")\n " +
" private boolean isSad;\n\n\n private String emailAddress;\n\n\n}\n\n" +
"@Resource(name = \"aa\",type=\"\")\nclass PostDoctoralStudent {\n\n " +
"@Resource(name = \"aa\",type=Object.class)\nclass PostDoctoralStudent {\n\n " +
"private Integer studentId;\n\n\n @Resource(shareable = true)\n " +
"private boolean isHappy;\n\n @Resource\n private boolean isSad;\n\n\n " +
"private String emailAddress;\n\n}\n\n@Resource(type = Object.class)\nclass " +
Expand Down
Loading