Skip to content

Annotation attribute non jvm class misses import #6786

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
timtebeek merged 2 commits into from
Feb 22, 2026
Merged

Annotation attribute non jvm class misses import #6786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f40be07
Annotation attribute non jvm class misses import
BoykoAlex Feb 20, 2026
8751c72
Correct test
BoykoAlex Feb 20, 2026
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
89 changes: 89 additions & 0 deletions rewrite-java-test/src/test/java/org/openrewrite/java/AddOrUpdateAnnotationAttributeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2901,6 +2901,95 @@ public class A {}
);
}

@Test
void appendClassValueToExistingNamedClassAttributeWithImport() {
rewriteRun(
spec -> spec.recipe(new AddOrUpdateAnnotationAttribute(
"org.example.Foo",
"classes",
"org.example.data.SomeData.class",
null,
null,
true
)),
java(
"""
package org.example;
public @interface Foo {
Class<?>[] classes();
}
"""
),
java(
"""
package org.example.data;
public interface SomeData {
}
"""
),
java(
"""
import org.example.Foo;

@Foo(classes = Integer.class)
public class A {}
""",
"""
import org.example.Foo;
import org.example.data.SomeData;

@Foo(classes = {Integer.class, SomeData.class})
public class A {}
"""
)
);
}

@Test
void createClassValueAttributeWithImportNonJvmType() {
rewriteRun(
spec -> spec.recipe(new AddOrUpdateAnnotationAttribute(
"org.example.Foo",
"classes",
"org.example.data.SomeData.class",
null,
null,
true
)),
java(
"""
package org.example;
public @interface Foo {
Class<?>[] classes();
String name;
}
"""
),
java(
"""
package org.example.data;
public interface SomeData {
}
"""
),
java(
"""
import org.example.Foo;

@Foo(name = "name")
public class A {}
""",
"""
import org.example.Foo;
import org.example.data.SomeData;

@Foo(classes = SomeData.class, name = "name")
public class A {}
"""
)
);
}

@Test
void dottedStringValueIsNotTreatedAsEnum() {
rewriteRun(
Expand Down
35 changes: 20 additions & 15 deletions rewrite-java/src/main/java/org/openrewrite/java/AddOrUpdateAnnotationAttribute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ public J.Annotation visitAnnotation(J.Annotation original, ExecutionContext ctx)
}
if ("value".equals(attributeName())) {
String attrVal = newAttributeValue.contains(",") && attributeIsArray(a) ? getAttributeValuesAsArray(a) : newAttributeValue;
return JavaTemplate.apply("#{}", getCursor(), a.getCoordinates().replaceArguments(), attrVal);
return getJavaTemplate("#{}").apply(getCursor(), a.getCoordinates().replaceArguments(), attrVal);
}
String attrVal = newAttributeValue.contains(",") && attributeIsArray(a) ? getAttributeValuesAsString(a) : newAttributeValue;
return JavaTemplate.apply("#{} = #{}", getCursor(), a.getCoordinates().replaceArguments(), attributeName, attrVal);
return getJavaTemplate("#{} = #{}").apply(getCursor(), a.getCoordinates().replaceArguments(), attributeName, attrVal);
}

// UPDATE the value when the annotation has arguments, e.g. @Foo(name="old") to `@Foo(name="new")
Expand Down Expand Up @@ -199,7 +199,7 @@ public J.Annotation visitAnnotation(J.Annotation original, ExecutionContext ctx)
return as.withAssignment(createNewArrayWithExistingAndNew(annotation, (J.FieldAccess) exp, getAttributeValues(annotation)));
}
//noinspection ConstantConditions
return JavaTemplate.<J.Annotation>apply("#{} = #{}", getCursor(), as.getCoordinates().replace(), var_.getSimpleName(), newAttributeValue)
return getJavaTemplate("#{} = #{}").<J.Annotation>apply(getCursor(), as.getCoordinates().replace(), var_.getSimpleName(), newAttributeValue)
.getArguments().get(annotation.getArguments().indexOf(as));
}
return as;
Expand Down Expand Up @@ -248,13 +248,24 @@ public J.Annotation visitAnnotation(J.Annotation original, ExecutionContext ctx)
getAttributeValues(annotation).stream().map(String::valueOf).collect(joining(",", "{", "}")) :
newAttributeValue;
//noinspection ConstantConditions
return JavaTemplate.<J.Annotation>apply("#{}", getCursor(), annotation.getCoordinates().replaceArguments(), attrVal)
return getJavaTemplate("#{}").<J.Annotation>apply(getCursor(), annotation.getCoordinates().replaceArguments(), attrVal)
.getArguments().get(0);
}
// Make the attribute name explicit, before we add the new value below
return createAnnotationAssignment(annotation, "value", fieldAccess);
}

private JavaTemplate getJavaTemplate(String template) {
JavaTemplate.Builder builder = JavaTemplate.builder(template);
if (isFullyQualifiedClass()) {
JavaType.ShallowClass fqn = JavaType.ShallowClass.build(attributeValue.substring(0, attributeValue.length() - 6));
builder
.javaParser(JavaParser.fromJavaVersion().dependsOn(String.format("package %s;\npublic interface %s {}\n", fqn.getPackageName(), fqn.getClassName())))
.imports(fqn.getFullyQualifiedName());
}
return builder.build();
}

private @Nullable Expression update(J.NewArray arrayValue, J.Annotation annotation, @Nullable String newAttributeValue) {
if (newAttributeValue == null) {
return null;
Expand All @@ -268,13 +279,13 @@ public J.Annotation visitAnnotation(J.Annotation original, ExecutionContext ctx)
private Expression createAnnotationLiteral(J.Annotation annotation, String newAttributeValue) {
String attrVal = newAttributeValue.contains(",") && attributeIsArray(annotation) ? getAttributeValuesAsString(annotation) : newAttributeValue;
//noinspection ConstantConditions
return JavaTemplate.<J.Annotation>apply("#{}", getCursor(), annotation.getCoordinates().replaceArguments(), attrVal)
return getJavaTemplate("#{}").<J.Annotation>apply(getCursor(), annotation.getCoordinates().replaceArguments(), attrVal)
.getArguments().get(0);
}

private J.Assignment createAnnotationAssignment(J.Annotation annotation, String name, @Nullable Object parameter) {
//noinspection ConstantConditions
return (J.Assignment) JavaTemplate.<J.Annotation>apply(name + " = " + (parameter instanceof J ? "#{any()}" : "#{}"), getCursor(), annotation.getCoordinates().replaceArguments(), parameter)
return (J.Assignment) getJavaTemplate(name + " = " + (parameter instanceof J ? "#{any()}" : "#{}")).<J.Annotation>apply(getCursor(), annotation.getCoordinates().replaceArguments(), parameter)
.getArguments().get(0);
}

Expand All @@ -290,7 +301,7 @@ private J.NewArray createNewArrayWithExistingAndNew(J.Annotation annotation, J.L
}
// Use a template to create the array structure, then replace the initializer
//noinspection ConstantConditions
J.NewArray template = (J.NewArray) JavaTemplate.<J.Annotation>apply("{#{any()}}", getCursor(), annotation.getCoordinates().replaceArguments(), existingLiteral)
J.NewArray template = (J.NewArray) getJavaTemplate("{#{any()}}").<J.Annotation>apply(getCursor(), annotation.getCoordinates().replaceArguments(), existingLiteral)
.getArguments().get(0);
return template.withInitializer(initializer);
}
Expand All @@ -302,19 +313,13 @@ private J.NewArray createNewArrayWithExistingAndNew(J.Annotation annotation, J.F
// Add new values, skipping duplicates - use template for non-string values
for (String attribute : newValues) {
if (!attributeNameOrValIsAlreadyPresent(initializer, singleton(attribute))) {
JavaTemplate.Builder templateBuilder = JavaTemplate.builder("#{}");
String templateValue = attribute;
// For FQ classes, add stub so type info is resolved and use FQ name in template
if (isFullyQualifiedClass()) {
String fqClassName = attributeValue.substring(0, attributeValue.length() - 6);
String packageName = fqClassName.substring(0, fqClassName.lastIndexOf('.'));
String simpleName = fqClassName.substring(fqClassName.lastIndexOf('.') + 1);
templateBuilder = templateBuilder.javaParser(JavaParser.fromJavaVersion()
.dependsOn("package " + packageName + "; public class " + simpleName + " {}"));
templateValue = fqClassName + ".class";
templateValue = getFullyQualifiedClass(attributeValue);
}
//noinspection ConstantConditions
Expression newExpr = templateBuilder.build().<J.Annotation>apply(getCursor(), annotation.getCoordinates().replaceArguments(), templateValue)
Expression newExpr = getJavaTemplate("#{}").<J.Annotation>apply(getCursor(), annotation.getCoordinates().replaceArguments(), templateValue)
.getArguments().get(0).withPrefix(SINGLE_SPACE);
initializer.add(newExpr);
}
Expand Down
⚡