Remove some obsolete logic now that the minimum supported JDK is 21

PiperOrigin-RevId: 808758850

Author: cushon

check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java

@@ -109,7 +109,6 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.lang.annotation.Target;
-import java.lang.reflect.Method;
 import java.net.JarURLConnection;
 import java.net.URI;
 import java.util.ArrayDeque;
@@ -498,15 +497,6 @@ public static void replaceDocTree(
 
   private static int endPosition(
       DCTree.DCEndPosTree<?> node, DCTree.DCDocComment comment, DocTreePath docPath) {
-    try {
-      Method method = DCTree.DCEndPosTree.class.getMethod("getEndPos", DCTree.DCDocComment.class);
-      return (int) method.invoke(node, comment);
-    } catch (NoSuchMethodException e) {
-      // continue below
-    } catch (ReflectiveOperationException e) {
-      throw new LinkageError(e.getMessage(), e);
-    }
-
     JCDiagnostic.DiagnosticPosition pos = node.pos(comment);
     EndPosTable endPositions =
         ((JCCompilationUnit) docPath.getTreePath().getCompilationUnit()).endPositions;

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

@@ -1543,30 +1543,8 @@ private static boolean hasSimpleName(AnnotationTree annotation, String name) {
     if (compound == null) {
       return null;
     }
-    return annotationTargetType(TypeAnnotations.instance(state.context), anno, compound, target);
-  }
-
-  private static AnnotationType annotationTargetType(
-      TypeAnnotations typeAnnotations,
-      AnnotationTree tree,
-      Compound compound,
-      @Nullable Symbol target) {
-    try {
-      try {
-        // the JCTree argument was added in JDK 21
-        return (AnnotationType)
-            TypeAnnotations.class
-                .getMethod("annotationTargetType", JCTree.class, Compound.class, Symbol.class)
-                .invoke(typeAnnotations, tree, compound, target);
-      } catch (NoSuchMethodException e1) {
-        return (AnnotationType)
-            TypeAnnotations.class
-                .getMethod("annotationTargetType", Compound.class, Symbol.class)
-                .invoke(typeAnnotations, compound, target);
-      }
-    } catch (ReflectiveOperationException e) {
-      throw new LinkageError(e.getMessage(), e);
-    }
+    return TypeAnnotations.instance(state.context)
+        .annotationTargetType((JCTree) anno, compound, target);
   }
 
   /**

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

@@ -117,22 +117,15 @@ public static Symbol findIdent(String name, VisitorState state) {
     }
   }
 
-  // Signature was changed in Java 13: https://bugs.openjdk.java.net/browse/JDK-8223305
   private static Symbol findIdent(
       String name, VisitorState state, KindSelector kind, Env<AttrContext> env)
       throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-    if (Runtime.version().feature() >= 13) {
-      Method method =
-          Resolve.class.getDeclaredMethod(
-              "findIdent", DiagnosticPosition.class, Env.class, Name.class, KindSelector.class);
-      method.setAccessible(true);
-      return (Symbol)
-          method.invoke(Resolve.instance(state.context), null, env, state.getName(name), kind);
-    }
     Method method =
-        Resolve.class.getDeclaredMethod("findIdent", Env.class, Name.class, KindSelector.class);
+        Resolve.class.getDeclaredMethod(
+            "findIdent", DiagnosticPosition.class, Env.class, Name.class, KindSelector.class);
     method.setAccessible(true);
-    return (Symbol) method.invoke(Resolve.instance(state.context), env, state.getName(name), kind);
+    return (Symbol)
+        method.invoke(Resolve.instance(state.context), null, env, state.getName(name), kind);
   }
 
   private static @Nullable ClassTree getEnclosingClass(TreePath treePath) {

core/src/main/java/com/google/errorprone/refaster/PlaceholderUnificationVisitor.java

@@ -29,7 +29,6 @@
 import com.sun.source.tree.BinaryTree;
 import com.sun.source.tree.BlockTree;
 import com.sun.source.tree.CaseTree;
-import com.sun.source.tree.CaseTree.CaseKind;
 import com.sun.source.tree.CatchTree;
 import com.sun.source.tree.CompoundAssignmentTree;
 import com.sun.source.tree.ConditionalExpressionTree;
@@ -652,43 +651,20 @@ public Choice<State<JCSwitch>> visitSwitch(SwitchTree node, State<?> state) {
 
   @Override
   public Choice<State<JCCase>> visitCase(CaseTree node, State<?> state) {
-    if (Runtime.version().feature() >= 21) {
-      return chooseSubtrees(
-          state,
-          s -> unify(node.getLabels(), s),
-          s -> unifyExpression(node.getGuard(), s),
-          s -> unifyStatements(node.getStatements(), s),
-          s -> unify(node.getBody(), s),
-          (labels, guard, stmts, body) ->
-              maker()
-                  .Case(
-                      node.getCaseKind(),
-                      List.convert(JCCaseLabel.class, labels),
-                      guard,
-                      stmts,
-                      body));
-    } else {
-      return chooseSubtrees(
-          state,
-          s -> unify(node.getLabels(), s),
-          s -> unifyStatements(node.getStatements(), s),
-          s -> unify(node.getBody(), s),
-          (labels, stmts, body) -> {
-            try {
-              return (JCCase)
-                  TreeMaker.class
-                      .getMethod("Case", CaseKind.class, List.class, List.class, JCTree.class)
-                      .invoke(
-                          maker(),
-                          node.getCaseKind(),
-                          List.convert(JCCaseLabel.class, labels),
-                          stmts,
-                          body);
-            } catch (ReflectiveOperationException e) {
-              throw new LinkageError(e.getMessage(), e);
-            }
-          });
-    }
+    return chooseSubtrees(
+        state,
+        s -> unify(node.getLabels(), s),
+        s -> unifyExpression(node.getGuard(), s),
+        s -> unifyStatements(node.getStatements(), s),
+        s -> unify(node.getBody(), s),
+        (labels, guard, stmts, body) ->
+            maker()
+                .Case(
+                    node.getCaseKind(),
+                    List.convert(JCCaseLabel.class, labels),
+                    guard,
+                    stmts,
+                    body));
   }
 
   @Override