From a4e705dc6e2d9c3633e9e533cda8b9092bfffc52 Mon Sep 17 00:00:00 2001
From: Kurt Alfred Kluever <kak@google.com>
Date: Mon, 11 May 2026 06:32:04 -0700
Subject: [PATCH] Migrate from `sym.getKind() == ElementKind.CONSTRUCTOR` to
 `sym.isConstructor()`.

PiperOrigin-RevId: 913667880
---
 .../errorprone/matchers/method/MethodInvocationMatcher.java    | 3 +--
 .../src/main/java/com/google/errorprone/util/ASTHelpers.java   | 3 +--
 .../java/com/google/errorprone/bugpatterns/UnusedMethod.java   | 3 +--
 .../google/errorprone/matchers/MethodHasParametersTest.java    | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/check_api/src/main/java/com/google/errorprone/matchers/method/MethodInvocationMatcher.java b/check_api/src/main/java/com/google/errorprone/matchers/method/MethodInvocationMatcher.java
index 3cf4603c441..d533678f262 100644
--- a/check_api/src/main/java/com/google/errorprone/matchers/method/MethodInvocationMatcher.java
+++ b/check_api/src/main/java/com/google/errorprone/matchers/method/MethodInvocationMatcher.java
@@ -40,7 +40,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.BiPredicate;
-import javax.lang.model.element.ElementKind;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -88,7 +87,7 @@ public enum TokenType {
     KIND {
       @Override
       MethodKind extract(Context ctx, VisitorState s) {
-        return ctx.sym.getKind() == ElementKind.CONSTRUCTOR
+        return ctx.sym.isConstructor()
             ? MethodKind.CONSTRUCTOR
             : ctx.sym.isStatic() ? MethodKind.STATIC : MethodKind.INSTANCE;
       }
diff --git a/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java b/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java
index cb237a2a803..94d3bf53755 100644
--- a/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java
+++ b/check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java
@@ -29,7 +29,6 @@
 import static com.sun.tools.javac.code.Scope.LookupKind.NON_RECURSIVE;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toCollection;
-import static javax.lang.model.element.ElementKind.CONSTRUCTOR;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
@@ -816,7 +815,7 @@ public static boolean isRecord(Symbol symbol) {
   public static MethodSymbol canonicalConstructor(ClassSymbol record, VisitorState state) {
     var fieldTypes =
         record.getRecordComponents().stream().map(rc -> rc.type).collect(toImmutableList());
-    return stream(record.members().getSymbols(s -> s.getKind() == CONSTRUCTOR))
+    return stream(record.members().getSymbols(s -> s.isConstructor()))
         .map(c -> (MethodSymbol) c)
         .filter(
             c ->
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java
index 4fa5633984a..0b536187507 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java
@@ -38,7 +38,6 @@
 import static com.google.errorprone.util.MoreAnnotations.asStrings;
 import static com.google.errorprone.util.MoreAnnotations.getAnnotationValue;
 import static java.lang.String.format;
-import static javax.lang.model.element.ElementKind.CONSTRUCTOR;
 import static javax.lang.model.element.ElementKind.FIELD;
 import static javax.lang.model.element.Modifier.FINAL;
 
@@ -239,7 +238,7 @@ && isSubtype(lastParamType, GWT_JAVASCRIPT_OBJECT.get(state), state)) {
       }
 
       private boolean isExemptedConstructor(MethodSymbol methodSymbol, VisitorState state) {
-        if (!methodSymbol.getKind().equals(CONSTRUCTOR)) {
+        if (!methodSymbol.isConstructor()) {
           return false;
         }
         // Don't delete unused zero-arg constructors, given those are often there to limit
diff --git a/core/src/test/java/com/google/errorprone/matchers/MethodHasParametersTest.java b/core/src/test/java/com/google/errorprone/matchers/MethodHasParametersTest.java
index 38a52b9421e..2296b21a5ba 100644
--- a/core/src/test/java/com/google/errorprone/matchers/MethodHasParametersTest.java
+++ b/core/src/test/java/com/google/errorprone/matchers/MethodHasParametersTest.java
@@ -22,7 +22,6 @@
 import static com.google.errorprone.matchers.Matchers.variableType;
 import static com.google.errorprone.predicates.TypePredicates.isPrimitive;
 import static com.google.errorprone.util.ASTHelpers.getSymbol;
-import static javax.lang.model.element.ElementKind.CONSTRUCTOR;
 
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.scanner.Scanner;
@@ -168,7 +167,7 @@ public Void visitMethod(MethodTree node, VisitorState visitorState) {
           }
 
           private boolean isConstructor(MethodTree node) {
-            return getSymbol(node).getKind() == CONSTRUCTOR;
+            return getSymbol(node).isConstructor();
           }
 
           @Override