From b7cc67d92964d8c0872f65e2df66340c943a9f47 Mon Sep 17 00:00:00 2001 From: Artur Havliukovskyi Date: Mon, 20 Jan 2025 10:28:08 +0100 Subject: [PATCH 1/2] Add jakarta annotations to UnusedVariable --- .../com/google/errorprone/bugpatterns/UnusedVariable.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java index 9e26fee6fb1..4fc22443395 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java @@ -144,6 +144,11 @@ public final class UnusedVariable extends BugChecker implements CompilationUnitT */ private static final ImmutableSet EXEMPTING_VARIABLE_ANNOTATIONS = ImmutableSet.of( + "jakarta.persistence.Basic", + "jakarta.persistence.Column", + "jakarta.persistence.Id", + "jakarta.persistence.Version", + "jakarta.xml.bind.annotation.XmlElement", "javax.persistence.Basic", "javax.persistence.Column", "javax.persistence.Id", @@ -168,6 +173,7 @@ public final class UnusedVariable extends BugChecker implements CompilationUnitT "com.google.inject.multibindings.ProvidesIntoMap", "com.google.inject.multibindings.ProvidesIntoSet", "dagger.Provides", + "jakarta.inject.Inject", "javax.inject.Inject"); private final ImmutableSet methodAnnotationsExemptingParameters; From 28be10101cddeee143644f7367cd078ec19905bf Mon Sep 17 00:00:00 2001 From: Artur Havliukovskyi Date: Mon, 20 Jan 2025 11:04:20 +0100 Subject: [PATCH 2/2] Add jakarta annotations to FieldCanBeFinal, TooManyParameters, UnnecessarilyVisible, UnnecessaryAssignment --- .../com/google/errorprone/bugpatterns/FieldCanBeFinal.java | 4 ++++ .../com/google/errorprone/bugpatterns/TooManyParameters.java | 1 + .../google/errorprone/bugpatterns/UnnecessarilyVisible.java | 3 ++- .../google/errorprone/bugpatterns/UnnecessaryAssignment.java | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeFinal.java b/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeFinal.java index d3b2201e995..ce72c77b73f 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeFinal.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeFinal.java @@ -77,6 +77,10 @@ public class FieldCanBeFinal extends BugChecker implements CompilationUnitTreeMa "com.google.inject.Inject", "com.google.inject.testing.fieldbinder.Bind", "com.google.testing.junit.testparameterinjector.TestParameter", + "jakarta.inject.Inject", + "jakarta.jdo.annotations.Persistent", + "jakarta.persistence.Id", + "jakarta.xml.bind.annotation.XmlAttribute", "javax.inject.Inject", "javax.jdo.annotations.Persistent", "javax.persistence.Id", diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/TooManyParameters.java b/core/src/main/java/com/google/errorprone/bugpatterns/TooManyParameters.java index 39f62011fc5..0fb66eb0454 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/TooManyParameters.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/TooManyParameters.java @@ -53,6 +53,7 @@ public class TooManyParameters extends BugChecker implements MethodTreeMatcher { "java.lang.Deprecated", "java.lang.Override", // dependency injection annotations + "jakarta.inject.Inject", "javax.inject.Inject", "com.google.inject.Inject", "com.google.inject.Provides", diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessarilyVisible.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessarilyVisible.java index f09be5fe033..9b34dfe7219 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessarilyVisible.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessarilyVisible.java @@ -63,6 +63,7 @@ public final class UnnecessarilyVisible extends BugChecker implements MethodTree "com.google.inject.multibindings.ProvidesIntoMap", "com.google.inject.multibindings.ProvidesIntoSet", "dagger.Provides", + "jakarta.inject.Inject", "javax.inject.Inject") .map(s::getName) .collect(toImmutableSet())); @@ -70,7 +71,7 @@ public final class UnnecessarilyVisible extends BugChecker implements MethodTree private static final Supplier> INJECT_ANNOTATIONS = VisitorState.memoize( s -> - Stream.of("com.google.inject.Inject", "javax.inject.Inject") + Stream.of("com.google.inject.Inject", "javax.inject.Inject", "jakarta.inject.Inject") .map(s::getName) .collect(toImmutableSet())); diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAssignment.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAssignment.java index 7ea5f1d9afe..7488734531e 100644 --- a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAssignment.java +++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAssignment.java @@ -80,6 +80,7 @@ public final class UnnecessaryAssignment extends BugChecker ImmutableSet.of( "com.google.testing.junit.testparameterinjector.TestParameter", "com.google.inject.Inject", + "jakarta.inject.Inject", "javax.inject.Inject"); private static final Matcher HAS_MOCK_ANNOTATION = hasAnnotation("org.mockito.Mock");