Skip to content

Fix RemoveUnusedPrivateFields for Lombok annotations after visibility modifiers #759

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 2 commits into from
Oct 22, 2025
Merged

Fix RemoveUnusedPrivateFields for Lombok annotations after visibility modifiers #759

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
c001b2c
Fix RemoveUnusedPrivateFields to detect annotations after visibility …
timtebeek Oct 22, 2025
055be24
Simplify approach
timtebeek Oct 22, 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
2 changes: 2 additions & 0 deletions src/main/java/org/openrewrite/staticanalysis/RemoveUnusedPrivateFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
// RSPEC-S1068 does not apply serialVersionUID of Serializable classes, or fields with annotations.
if (!(skipSerialVersionUID && isSerialVersionUid(vd)) &&
vd.getLeadingAnnotations().isEmpty() &&
!(vd.getTypeExpression() instanceof J.AnnotatedType) &&
vd.hasModifier(J.Modifier.Type.Private)) {
Statement nextStatement = i < statements.size() - 1 ? statements.get(i + 1) : null;
checkFields.add(new CheckField(vd, nextStatement));
Expand Down Expand Up @@ -138,6 +139,7 @@ private boolean isSerialVersionUid(J.VariableDeclarations vd) {
TypeUtils.isOfClassType(vd.getType(), "long") &&
vd.getVariables().stream().anyMatch(it -> "serialVersionUID".equals(it.getSimpleName()));
}

};
return Preconditions.check(new NoMissingTypes(), Repeat.repeatUntilStable(visitor));
}
Expand Down
26 changes: 26 additions & 0 deletions src/test/java/org/openrewrite/staticanalysis/RemoveUnusedPrivateFieldsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,32 @@ class A {
);
}

@Issue("https://github.com/openrewrite/rewrite-static-analysis/issues/757")
@Test
void doNotRemoveLombokAnnotatedFieldWhenAnnotationIsAfterModifier() {
rewriteRun(
spec -> spec.parser(JavaParser.fromJavaVersion().classpath("lombok")),
java(
"""
import lombok.Getter;

class OnModifier {
@Getter private String foo;
}
"""
),
java(
"""
import lombok.Getter;

class OnType {
private @Getter String foo;
}
"""
)
);
}

@Issue("https://github.com/openrewrite/rewrite-static-analysis/issues/524")
@Test
void removeUntilStable() {
Expand Down