Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,19 @@ class FieldAnnotator extends JavaIsoVisitor<ExecutionContext> {
public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) {
for (J.VariableDeclarations.NamedVariable variable : multiVariable.getVariables()) {
if (variable.getName().getFieldType() == field) {
maybeAddImport(annotation.getName());
maybeAddImport("lombok.AccessLevel");
String suffix = accessLevel == PUBLIC ? "" : String.format("(AccessLevel.%s)", accessLevel.name());
return JavaTemplate.builder("@" + annotation.getSimpleName() + suffix)
.imports(annotation.getName(), "lombok.AccessLevel")
.javaParser(JavaParser.fromJavaVersion().classpath("lombok"))
.build().apply(getCursor(), multiVariable.getCoordinates().addAnnotation(comparing(J.Annotation::getSimpleName)));
// Check if the annotation already exists (can happen with multiple variable declarations)
String annotationName = annotation.getSimpleName();
if (multiVariable.getLeadingAnnotations().stream()
.noneMatch(ann -> annotationName.equals(ann.getSimpleName()))) {
maybeAddImport(annotation.getName());
maybeAddImport("lombok.AccessLevel");
String suffix = accessLevel == PUBLIC ? "" : String.format("(AccessLevel.%s)", accessLevel.name());
return JavaTemplate.builder("@" + annotation.getSimpleName() + suffix)
.imports(annotation.getName(), "lombok.AccessLevel")
.javaParser(JavaParser.fromJavaVersion().classpath("lombok"))
.build().apply(getCursor(), multiVariable.getCoordinates().addAnnotation(comparing(J.Annotation::getSimpleName)));
}
return multiVariable;
}
}
return multiVariable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -638,4 +638,36 @@ private Long getNumber() {
)
);
}

@Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/876")
@Test
void multipleVariableDeclarations() {
rewriteRun(// language=java
java(
"""
class A {

int foo, bar = 9;

public int getFoo() {
return foo;
}

public int getBar() {
return bar;
}
}
""",
"""
import lombok.Getter;

class A {

@Getter
int foo, bar = 9;
}
"""
)
);
}
}