Prepare for a change to the return type of JCCompilationUnit#getImports in an upcoming JDK version

cushon · Error Prone Team · commit 9e0fbf705dc9 · 2024-05-23T09:51:54.000-07:00
PiperOrigin-RevId: 636582473
diff --git a/check_api/src/main/java/com/google/errorprone/apply/ImportStatements.java b/check_api/src/main/java/com/google/errorprone/apply/ImportStatements.java
@@ -17,14 +17,13 @@
 package com.google.errorprone.apply;
 
 import com.google.common.base.CharMatcher;
-import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.sun.tools.javac.tree.EndPosTable;
+import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 import com.sun.tools.javac.tree.JCTree.JCExpression;
-import com.sun.tools.javac.tree.JCTree.JCImport;
 import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -64,7 +63,7 @@ public static ImportStatements create(
 
   ImportStatements(
       JCExpression packageTree,
-      List<JCImport> importTrees,
+      List<? extends JCTree> importTrees,
       EndPosTable endPositions,
       ImportOrganizer importOrganizer) {
 
@@ -80,7 +79,7 @@ public static ImportStatements create(
     } else {
       // process list of imports and find start/end positions
       hasExistingImports = true;
-      for (JCImport importTree : importTrees) {
+      for (JCTree importTree : importTrees) {
         int currStartPos = importTree.getStartPosition();
         int currEndPos = importTree.getEndPosition(endPositions);
 
@@ -99,14 +98,9 @@ public static ImportStatements create(
     importStrings.addAll(
         Lists.transform(
             importTrees,
-            new Function<JCImport, String>() {
-              @Override
-              public String apply(JCImport input) {
-                String importExpr = input.toString();
-                return CharMatcher.whitespace()
-                    .or(CharMatcher.is(';'))
-                    .trimTrailingFrom(importExpr);
-              }
+            input -> {
+              String importExpr = input.toString();
+              return CharMatcher.whitespace().or(CharMatcher.is(';')).trimTrailingFrom(importExpr);
             }));
 
     originalImports = ImmutableSet.copyOf(importStrings);
diff --git a/core/src/main/java/com/google/errorprone/refaster/ImportPolicy.java b/core/src/main/java/com/google/errorprone/refaster/ImportPolicy.java
@@ -269,6 +269,8 @@ private static ImmutableSet<String> getAllImports(Inliner inliner, WhichImports
                 .map(JCCompilationUnit::getImports)
                 .map(Collection::stream)
                 .orElse(Stream.of())
+                .filter(JCImport.class::isInstance)
+                .map(JCImport.class::cast)
                 .filter(whichImports::existingImportMatches)
                 .map(imp -> getQualifiedIdentifier(imp).toString()))
         .collect(toImmutableSet());
