Update to Error Prone 2.39.0 (#1228)

msridhar · web-flow · commit e39856e7c3fb · 2025-06-28T21:03:31.000+05:30
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -25,13 +25,13 @@ jobs:
             epVersion: 2.31.0
           - os: macos-latest
             java: 17
-            epVersion: 2.38.0
+            epVersion: 2.39.0
           - os: windows-latest
             java: 17
-            epVersion: 2.38.0
+            epVersion: 2.39.0
           - os: ubuntu-latest
             java: 17
-            epVersion: 2.38.0
+            epVersion: 2.39.0
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -60,7 +60,7 @@ jobs:
           ORG_GRADLE_PROJECT_epApiVersion: ${{ matrix.epVersion }}
         run: ./gradlew codeCoverageReport
         continue-on-error: true
-        if: runner.os == 'Linux' && matrix.java == '17' && matrix.epVersion == '2.38.0' && github.repository == 'uber/NullAway'
+        if: runner.os == 'Linux' && matrix.java == '17' && matrix.epVersion == '2.39.0' && github.repository == 'uber/NullAway'
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
         with:
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -19,7 +19,7 @@ import org.gradle.util.VersionNumber
 // The oldest version of Error Prone that we support running on
 def oldestErrorProneVersion = "2.14.0"
 // Latest released Error Prone version that we've tested with
-def latestErrorProneVersion = "2.38.0"
+def latestErrorProneVersion = "2.39.0"
 // Default to using latest tested Error Prone version
 def defaultErrorProneVersion =  latestErrorProneVersion
 def errorProneVersionToCompileAgainst = defaultErrorProneVersion
diff --git a/nullaway/src/main/java/com/uber/nullaway/ErrorBuilder.java b/nullaway/src/main/java/com/uber/nullaway/ErrorBuilder.java
@@ -378,7 +378,7 @@ private Description.Builder removeCastToNonNullFix(
     // should be currently pointing at said call.
     Tree currTree = state.getPath().getLeaf();
     Preconditions.checkArgument(
-        currTree.getKind() == Tree.Kind.METHOD_INVOCATION,
+        currTree instanceof MethodInvocationTree,
         "Expected castToNonNull invocation expression, found:\n%s",
         currTree);
     MethodInvocationTree invTree = (MethodInvocationTree) currTree;
diff --git a/nullaway/src/main/java/com/uber/nullaway/NullAway.java b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
@@ -23,11 +23,8 @@
 package com.uber.nullaway;
 
 import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
-import static com.sun.source.tree.Tree.Kind.EXPRESSION_STATEMENT;
 import static com.sun.source.tree.Tree.Kind.IDENTIFIER;
 import static com.sun.source.tree.Tree.Kind.OTHER;
-import static com.sun.source.tree.Tree.Kind.PARENTHESIZED;
-import static com.sun.source.tree.Tree.Kind.TYPE_CAST;
 import static com.uber.nullaway.ASTHelpersBackports.hasDirectAnnotationWithSimpleName;
 import static com.uber.nullaway.ASTHelpersBackports.isStatic;
 import static com.uber.nullaway.ErrorBuilder.errMsgForInitializer;
@@ -59,6 +56,7 @@
 import com.sun.source.tree.AnnotatedTypeTree;
 import com.sun.source.tree.AnnotationTree;
 import com.sun.source.tree.ArrayAccessTree;
+import com.sun.source.tree.AssertTree;
 import com.sun.source.tree.AssignmentTree;
 import com.sun.source.tree.BinaryTree;
 import com.sun.source.tree.BlockTree;
@@ -1197,8 +1195,7 @@ private Description checkForReadBeforeInit(ExpressionTree tree, VisitorState sta
       // is this possible?
       return Description.NO_MATCH;
     }
-    if (!config.assertsEnabled()
-        && enclosingBlockPath.getLeaf().getKind().equals(Tree.Kind.ASSERT)) {
+    if (!config.assertsEnabled() && enclosingBlockPath.getLeaf() instanceof AssertTree) {
       return Description.NO_MATCH;
     }
     if (!relevantInitializerMethodOrBlock(enclosingBlockPath, state)) {
@@ -1375,7 +1372,7 @@ private ImmutableSet<Element> safeInitByCalleeBefore(
           safeInitMethods.add(privMethodElem);
         }
         // Hack: Handling try{...}finally{...} statement, see getSafeInitMethods
-        if (curStmt.getKind().equals(Tree.Kind.TRY)) {
+        if (curStmt instanceof TryTree) {
           TryTree tryTree = (TryTree) curStmt;
           // ToDo: Should we check initialization inside tryTree.getResources ? What is the scope of
           // that initialization?
@@ -2356,7 +2353,7 @@ private Set<Element> getSafeInitMethods(
       // as "top level" for the purposes of finding initialization methods. Any exception happening
       // there is also an
       // exception of the full method.
-      if (stmt.getKind().equals(Tree.Kind.TRY)) {
+      if (stmt instanceof TryTree) {
         TryTree tryTree = (TryTree) stmt;
         if (tryTree.getCatches().size() == 0) {
           if (tryTree.getBlock() != null) {
@@ -2405,7 +2402,7 @@ private Set<Element> getSafeInitMethods(
           }
           return false;
         };
-    if (stmt.getKind().equals(EXPRESSION_STATEMENT)) {
+    if (stmt instanceof ExpressionStatementTree) {
       ExpressionTree expression = ((ExpressionStatementTree) stmt).getExpression();
       if (invokeMatcher.matches(expression, state)) {
         return ASTHelpers.getSymbol(expression);
@@ -2415,7 +2412,7 @@ private Set<Element> getSafeInitMethods(
   }
 
   private boolean isThisCall(StatementTree statementTree, VisitorState state) {
-    if (statementTree.getKind().equals(EXPRESSION_STATEMENT)) {
+    if (statementTree instanceof ExpressionStatementTree) {
       ExpressionTree expression = ((ExpressionStatementTree) statementTree).getExpression();
       return Matchers.methodInvocation(THIS_MATCHER).matches(expression, state);
     }
@@ -2754,7 +2751,7 @@ private Description matchDereference(
   }
 
   private static boolean isThisIdentifier(ExpressionTree expressionTree) {
-    return expressionTree.getKind().equals(IDENTIFIER)
+    return expressionTree instanceof IdentifierTree
         && ((IdentifierTree) expressionTree).getName().toString().equals("this");
   }
 
@@ -2777,11 +2774,11 @@ private static ExpressionTree stripParensAndCasts(ExpressionTree expr) {
     boolean someChange = true;
     while (someChange) {
       someChange = false;
-      if (expr.getKind().equals(PARENTHESIZED)) {
+      if (expr instanceof ParenthesizedTree) {
         expr = ((ParenthesizedTree) expr).getExpression();
         someChange = true;
       }
-      if (expr.getKind().equals(TYPE_CAST)) {
+      if (expr instanceof TypeCastTree) {
         expr = ((TypeCastTree) expr).getExpression();
         someChange = true;
       }
diff --git a/nullaway/src/main/java/com/uber/nullaway/dataflow/AccessPath.java b/nullaway/src/main/java/com/uber/nullaway/dataflow/AccessPath.java
@@ -455,7 +455,7 @@ private static boolean isBoxingMethod(Symbol.MethodSymbol methodSymbol) {
           Tree tree = argumentNode.getTree();
           if (tree == null) {
             return null; // Not an AP
-          } else if (tree.getKind().equals(Tree.Kind.METHOD_INVOCATION)) {
+          } else if (tree instanceof MethodInvocationTree) {
             // Check for boxing call
             MethodInvocationTree methodInvocationTree = (MethodInvocationTree) tree;
             if (methodInvocationTree.getArguments().size() == 1
diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/FieldInitializationSerializationHandler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/FieldInitializationSerializationHandler.java
@@ -24,7 +24,7 @@
 
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.util.ASTHelpers;
-import com.sun.source.tree.Tree;
+import com.sun.source.tree.MethodTree;
 import com.sun.source.util.TreePath;
 import com.sun.tools.javac.code.Symbol;
 import com.uber.nullaway.NullabilityUtil;
@@ -65,7 +65,7 @@ public void onNonNullFieldAssignment(
     // state parameter
     TreePath pathToMethod =
         NullabilityUtil.findEnclosingMethodOrLambdaOrInitializer(state.getPath());
-    if (pathToMethod == null || pathToMethod.getLeaf().getKind() != Tree.Kind.METHOD) {
+    if (pathToMethod == null || !(pathToMethod.getLeaf() instanceof MethodTree)) {
       return;
     }
     Symbol symbol = ASTHelpers.getSymbol(pathToMethod.getLeaf());
diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/LibraryModelsHandler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/LibraryModelsHandler.java
@@ -34,7 +34,7 @@
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.Tree;
+import com.sun.source.tree.MethodInvocationTree;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Types;
 import com.sun.tools.javac.util.Context;
@@ -164,8 +164,7 @@ public boolean onOverrideMayBeNullExpr(
     if (isNullableFieldInLibraryModels(exprSymbol)) {
       return true;
     }
-    if (!(expr.getKind() == Tree.Kind.METHOD_INVOCATION
-        && exprSymbol instanceof Symbol.MethodSymbol)) {
+    if (!(expr instanceof MethodInvocationTree && exprSymbol instanceof Symbol.MethodSymbol)) {
       return exprMayBeNull;
     }
     OptimizedLibraryModels optLibraryModels = getOptLibraryModels(state.context);
diff --git a/nullaway/src/main/java/com/uber/nullaway/handlers/OptionalEmptinessHandler.java b/nullaway/src/main/java/com/uber/nullaway/handlers/OptionalEmptinessHandler.java
@@ -27,7 +27,7 @@
 import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.Tree;
+import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.util.TreePath;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Symtab;
@@ -89,7 +89,7 @@ public boolean onOverrideMayBeNullExpr(
     if (exprMayBeNull) {
       return true;
     }
-    if (expr.getKind() == Tree.Kind.METHOD_INVOCATION
+    if (expr instanceof MethodInvocationTree
         && exprSymbol instanceof Symbol.MethodSymbol
         && optionalIsGetCall((Symbol.MethodSymbol) exprSymbol, state.getTypes())) {
       return true;
