Skip to content

Commit a4e705d

Browse files
klueverError Prone Team
authored andcommitted
Migrate from sym.getKind() == ElementKind.CONSTRUCTOR to sym.isConstructor().
PiperOrigin-RevId: 913667880
1 parent a897160 commit a4e705d

4 files changed

Lines changed: 4 additions & 8 deletions

File tree

check_api/src/main/java/com/google/errorprone/matchers/method/MethodInvocationMatcher.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import java.util.Optional;
4141
import java.util.Set;
4242
import java.util.function.BiPredicate;
43-
import javax.lang.model.element.ElementKind;
4443
import org.jspecify.annotations.Nullable;
4544

4645
/**
@@ -88,7 +87,7 @@ public enum TokenType {
8887
KIND {
8988
@Override
9089
MethodKind extract(Context ctx, VisitorState s) {
91-
return ctx.sym.getKind() == ElementKind.CONSTRUCTOR
90+
return ctx.sym.isConstructor()
9291
? MethodKind.CONSTRUCTOR
9392
: ctx.sym.isStatic() ? MethodKind.STATIC : MethodKind.INSTANCE;
9493
}

check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import static com.sun.tools.javac.code.Scope.LookupKind.NON_RECURSIVE;
3030
import static java.util.Objects.requireNonNull;
3131
import static java.util.stream.Collectors.toCollection;
32-
import static javax.lang.model.element.ElementKind.CONSTRUCTOR;
3332

3433
import com.github.benmanes.caffeine.cache.Cache;
3534
import com.github.benmanes.caffeine.cache.Caffeine;
@@ -816,7 +815,7 @@ public static boolean isRecord(Symbol symbol) {
816815
public static MethodSymbol canonicalConstructor(ClassSymbol record, VisitorState state) {
817816
var fieldTypes =
818817
record.getRecordComponents().stream().map(rc -> rc.type).collect(toImmutableList());
819-
return stream(record.members().getSymbols(s -> s.getKind() == CONSTRUCTOR))
818+
return stream(record.members().getSymbols(s -> s.isConstructor()))
820819
.map(c -> (MethodSymbol) c)
821820
.filter(
822821
c ->

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import static com.google.errorprone.util.MoreAnnotations.asStrings;
3939
import static com.google.errorprone.util.MoreAnnotations.getAnnotationValue;
4040
import static java.lang.String.format;
41-
import static javax.lang.model.element.ElementKind.CONSTRUCTOR;
4241
import static javax.lang.model.element.ElementKind.FIELD;
4342
import static javax.lang.model.element.Modifier.FINAL;
4443

@@ -239,7 +238,7 @@ && isSubtype(lastParamType, GWT_JAVASCRIPT_OBJECT.get(state), state)) {
239238
}
240239

241240
private boolean isExemptedConstructor(MethodSymbol methodSymbol, VisitorState state) {
242-
if (!methodSymbol.getKind().equals(CONSTRUCTOR)) {
241+
if (!methodSymbol.isConstructor()) {
243242
return false;
244243
}
245244
// Don't delete unused zero-arg constructors, given those are often there to limit

core/src/test/java/com/google/errorprone/matchers/MethodHasParametersTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import static com.google.errorprone.matchers.Matchers.variableType;
2323
import static com.google.errorprone.predicates.TypePredicates.isPrimitive;
2424
import static com.google.errorprone.util.ASTHelpers.getSymbol;
25-
import static javax.lang.model.element.ElementKind.CONSTRUCTOR;
2625

2726
import com.google.errorprone.VisitorState;
2827
import com.google.errorprone.scanner.Scanner;
@@ -168,7 +167,7 @@ public Void visitMethod(MethodTree node, VisitorState visitorState) {
168167
}
169168

170169
private boolean isConstructor(MethodTree node) {
171-
return getSymbol(node).getKind() == CONSTRUCTOR;
170+
return getSymbol(node).isConstructor();
172171
}
173172

174173
@Override

0 commit comments

Comments
 (0)