Skip to content

Commit 28f119a

Browse files
gavlyukovskiyError Prone Team
authored andcommitted
Add support for jakarta annotations to some checks
This MR adds jakarta annotations to the exempt lists. We're currently migrating to Jakarta EE and we have to temporarily disable the rule or add exceptions in the code. I didn't add new tests since it's just additional exempt annotations, but let me know if you want explicit tests. Fixes #4782 COPYBARA_INTEGRATE_REVIEW=#4782 from gavlyukovskiy:patch-1 398cd4a PiperOrigin-RevId: 731727129
1 parent d6b3c13 commit 28f119a

File tree

6 files changed

+16
-1
lines changed

6 files changed

+16
-1
lines changed

core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeFinal.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ public class FieldCanBeFinal extends BugChecker implements CompilationUnitTreeMa
7777
"com.google.inject.Inject",
7878
"com.google.inject.testing.fieldbinder.Bind",
7979
"com.google.testing.junit.testparameterinjector.TestParameter",
80+
"jakarta.inject.Inject",
81+
"jakarta.jdo.annotations.Persistent",
82+
"jakarta.persistence.Id",
83+
"jakarta.xml.bind.annotation.XmlAttribute",
8084
"javax.inject.Inject",
8185
"javax.jdo.annotations.Persistent",
8286
"javax.persistence.Id",

core/src/main/java/com/google/errorprone/bugpatterns/TooManyParameters.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public class TooManyParameters extends BugChecker implements MethodTreeMatcher {
5353
"java.lang.Deprecated",
5454
"java.lang.Override",
5555
// dependency injection annotations
56+
"jakarta.inject.Inject",
5657
"javax.inject.Inject",
5758
"com.google.inject.Inject",
5859
"com.google.inject.Provides",

core/src/main/java/com/google/errorprone/bugpatterns/UnnecessarilyVisible.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,15 @@ public final class UnnecessarilyVisible extends BugChecker implements MethodTree
6363
"com.google.inject.multibindings.ProvidesIntoMap",
6464
"com.google.inject.multibindings.ProvidesIntoSet",
6565
"dagger.Provides",
66+
"jakarta.inject.Inject",
6667
"javax.inject.Inject")
6768
.map(s::getName)
6869
.collect(toImmutableSet()));
6970

7071
private static final Supplier<ImmutableSet<Name>> INJECT_ANNOTATIONS =
7172
VisitorState.memoize(
7273
s ->
73-
Stream.of("com.google.inject.Inject", "javax.inject.Inject")
74+
Stream.of("com.google.inject.Inject", "javax.inject.Inject", "jakarta.inject.Inject")
7475
.map(s::getName)
7576
.collect(toImmutableSet()));
7677

core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAssignment.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public final class UnnecessaryAssignment extends BugChecker
7979
ImmutableSet.of(
8080
"com.google.testing.junit.testparameterinjector.TestParameter",
8181
"com.google.inject.Inject",
82+
"jakarta.inject.Inject",
8283
"javax.inject.Inject");
8384

8485
private static final Matcher<Tree> HAS_MOCK_ANNOTATION = hasAnnotation("org.mockito.Mock");

core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ public final class UnusedMethod extends BugChecker implements CompilationUnitTre
132132
"jakarta.persistence.PrePersist",
133133
"jakarta.persistence.PreRemove",
134134
"jakarta.persistence.PreUpdate",
135+
"jakarta.validation.constraints.AssertFalse",
136+
"jakarta.validation.constraints.AssertTrue",
135137
"javax.annotation.PreDestroy",
136138
"javax.annotation.PostConstruct",
137139
"javax.inject.Inject",

core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@ public final class UnusedVariable extends BugChecker implements CompilationUnitT
144144
*/
145145
private static final ImmutableSet<String> EXEMPTING_VARIABLE_ANNOTATIONS =
146146
ImmutableSet.of(
147+
"jakarta.persistence.Basic",
148+
"jakarta.persistence.Column",
149+
"jakarta.persistence.Id",
150+
"jakarta.persistence.Version",
151+
"jakarta.xml.bind.annotation.XmlElement",
147152
"javax.persistence.Basic",
148153
"javax.persistence.Column",
149154
"javax.persistence.Id",
@@ -168,6 +173,7 @@ public final class UnusedVariable extends BugChecker implements CompilationUnitT
168173
"com.google.inject.multibindings.ProvidesIntoMap",
169174
"com.google.inject.multibindings.ProvidesIntoSet",
170175
"dagger.Provides",
176+
"jakarta.inject.Inject",
171177
"javax.inject.Inject",
172178
// Parameters on test methods imply the test is parameterised, and those parameters should
173179
// be used or removed.

0 commit comments

Comments
 (0)