Update minimum supported Error Prone version to 2.25.0 (#1421)

This is a pre-cursor to #1396. Here we bump our minimum supported EP
version to 2.25.0. This lets us clean up / remove a bunch of
compatibility code. Also clean up some related dependencies.

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Chores**
  * Updated minimum Error Prone version requirement to 2.25.0
* Added a centralized Guava version (33.5.0-jre) and switched tests to
use it

* **Refactor**
* Removed custom compatibility/backport layer and now use Error Prone's
standard utilities directly
  * Simplified internals to rely on standard symbol helpers

* **Tests**
* Adjusted test configuration (annotated-package settings and test
dependencies) for compatibility with the newer toolchain

<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Author: msridhar

README.md

@@ -8,7 +8,7 @@ NullAway is *fast*.  It is built as a plugin to [Error Prone](http://errorprone.
 
 ### Overview
 
-NullAway requires that you build your code with [Error Prone](http://errorprone.info), version 2.14.0 or higher.  See the [Error Prone documentation](http://errorprone.info/docs/installation) for instructions on getting started with Error Prone and integration with your build system.  The instructions below assume you are using Gradle; see [the docs](https://github.com/uber/NullAway/wiki/Configuration#other-build-systems) for discussion of other build systems.  If you are building with JSpecify mode enabled, we recommend building with the most recent JDK available; see [the wiki docs on JSpecify support](https://github.com/uber/NullAway/wiki/JSpecify-Support) for more details.
+NullAway requires that you build your code with [Error Prone](http://errorprone.info), version 2.25.0 or higher.  See the [Error Prone documentation](http://errorprone.info/docs/installation) for instructions on getting started with Error Prone and integration with your build system.  The instructions below assume you are using Gradle; see [the docs](https://github.com/uber/NullAway/wiki/Configuration#other-build-systems) for discussion of other build systems.  If you are building with JSpecify mode enabled, we recommend building with the most recent JDK available; see [the wiki docs on JSpecify support](https://github.com/uber/NullAway/wiki/JSpecify-Support) for more details.
 
 ### Gradle
 

gradle/libs.versions.toml

@@ -18,13 +18,14 @@ shellcheck = "1.5.0"
 
 errorProne = "2.45.0"
 errorProneJdk17 = "2.42.0"
-errorProneOldest = "2.14.0"
+errorProneOldest = "2.25.0"
 
 semver4j = "3.1.0"
 jakarta-inject = "2.0.0"
 javax-inject = "1"
 gson = "2.13.1"
 guava = "31.1-jre"
+guava-latest = "33.5.0-jre"
 javax-validation = "2.0.1.Final"
 jspecify = "1.0.0"
 commons-io = "2.11.0"
@@ -78,6 +79,7 @@ error-prone-test-helpers = { module = "com.google.errorprone:error_prone_test_he
 checker-dataflow = { module = "org.checkerframework:dataflow-nullaway", version.ref = "check-framework" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
+guava-latest = { module = "com.google.guava:guava", version.ref = "guava-latest" }
 javax-validation = { module = "javax.validation:validation-api", version.ref = "javax-validation" }
 jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" }
 commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }

guava-recent-unit-tests/build.gradle

@@ -33,13 +33,15 @@ dependencies {
         exclude group: "junit", module: "junit"
     }
     testImplementation libs.jsr305
-    testImplementation "com.google.guava:guava:33.4.8-jre"
+    testImplementation libs.guava.latest
 
     errorProneOldest "com.google.errorprone:error_prone_check_api:${oldestErrorProneVersion}"
     errorProneOldest("com.google.errorprone:error_prone_test_helpers:${oldestErrorProneVersion}") {
         exclude group: "junit", module: "junit"
     }
-    errorProneOldest libs.guava
+    errorProneOldest libs.guava.latest
+
+    errorProneJdk17 libs.guava.latest
 }
 
 // Create a task to test with the oldest supported version of Error Prone

guava-recent-unit-tests/src/test/java/com/uber/nullaway/guava/NullAwayGuavaParametricNullnessTests.java

@@ -47,14 +47,7 @@ public void setup() {
                 Arrays.asList(
                     "-d",
                     temporaryFolder.getRoot().getAbsolutePath(),
-                    // Since Guava is now @NullMarked we shouldn't need com.google.common in the
-                    // annotated packages list.
-                    // We still need it here since we are still trying to support
-                    // Error Prone 2.14.0, on which reading @NullMarked from the package-info.java
-                    // file isn't working using ASTHelpers for some reason.
-                    // TODO Once we bump our minimum Error Prone version, remove com.google.common
-                    //  from this list.
-                    "-XepOpt:NullAway:AnnotatedPackages=com.uber,com.google.common",
+                    "-XepOpt:NullAway:AnnotatedPackages=com.uber",
                     "-XepOpt:NullAway:UnannotatedSubPackages=com.uber.nullaway.[a-zA-Z0-9.]+.unannotated"));
     jspecifyCompilationHelper =
         CompilationTestHelper.newInstance(NullAway.class, getClass())

nullaway/build.gradle

@@ -85,6 +85,7 @@ dependencies {
 
     // without this, some other version of the JetBrains annotations gets pulled in via transitive dependencies
     errorProneJdk17 libs.jetbrains.annotations
+    errorProneOldest libs.jetbrains.annotations
 }
 
 javadoc {

nullaway/src/main/java/com/uber/nullaway/ASTHelpersBackports.java

@@ -23,7 +23,7 @@
 package com.uber.nullaway;
 
 import static com.google.errorprone.util.ASTHelpers.enclosingClass;
-import static com.uber.nullaway.ASTHelpersBackports.hasDirectAnnotationWithSimpleName;
+import static com.google.errorprone.util.ASTHelpers.hasDirectAnnotationWithSimpleName;
 import static com.uber.nullaway.NullabilityUtil.castToNonNull;
 
 import com.google.common.base.Preconditions;

nullaway/src/main/java/com/uber/nullaway/CodeAnnotationInfo.java

@@ -22,8 +22,8 @@
 
 package com.uber.nullaway;
 
-import static com.uber.nullaway.ASTHelpersBackports.hasDirectAnnotationWithSimpleName;
-import static com.uber.nullaway.ASTHelpersBackports.isStatic;
+import static com.google.errorprone.util.ASTHelpers.hasDirectAnnotationWithSimpleName;
+import static com.google.errorprone.util.ASTHelpers.isStatic;
 import static com.uber.nullaway.ErrorMessage.MessageTypes.FIELD_NO_INIT;
 import static com.uber.nullaway.ErrorMessage.MessageTypes.GET_ON_EMPTY_OPTIONAL;
 import static com.uber.nullaway.ErrorMessage.MessageTypes.METHOD_NO_INIT;

nullaway/src/main/java/com/uber/nullaway/ErrorBuilder.java

@@ -23,8 +23,8 @@
 package com.uber.nullaway;
 
 import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;
-import static com.uber.nullaway.ASTHelpersBackports.hasDirectAnnotationWithSimpleName;
-import static com.uber.nullaway.ASTHelpersBackports.isStatic;
+import static com.google.errorprone.util.ASTHelpers.hasDirectAnnotationWithSimpleName;
+import static com.google.errorprone.util.ASTHelpers.isStatic;
 import static com.uber.nullaway.ErrorBuilder.errMsgForInitializer;
 import static com.uber.nullaway.NullabilityUtil.castToNonNull;
 import static com.uber.nullaway.NullabilityUtil.isArrayElementNullable;
@@ -336,12 +336,7 @@ private boolean isCallToUnmarkedMethod(ExpressionTree expr) {
       return false;
     }
 
-    Symbol.MethodSymbol methodSymbol = getSymbolForMethodInvocation(methodInvoke);
-
-    if (methodSymbol == null) {
-      return false;
-    }
-
+    Symbol.MethodSymbol methodSymbol = ASTHelpers.getSymbol(methodInvoke);
     return codeAnnotationInfo.isSymbolUnannotated(methodSymbol, config, handler);
   }
 
@@ -429,40 +424,19 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
     if (!withinAnnotatedCode(state)) {
       return Description.NO_MATCH;
     }
-    Symbol.MethodSymbol methodSymbol = getSymbolForMethodInvocation(tree);
+    Symbol.MethodSymbol methodSymbol = ASTHelpers.getSymbol(tree);
     handler.onMatchMethodInvocation(tree, new MethodAnalysisContext(this, state, methodSymbol));
     // assuming this list does not include the receiver
     List<? extends ExpressionTree> actualParams = tree.getArguments();
     return handleInvocation(tree, state, methodSymbol, actualParams);
   }
 
-  private static Symbol.MethodSymbol getSymbolForMethodInvocation(MethodInvocationTree tree) {
-    Symbol.MethodSymbol methodSymbol = ASTHelpers.getSymbol(tree);
-    Verify.verify(methodSymbol != null, "not expecting unresolved method here");
-    // In certain cases, we need to get the base symbol for the method rather than the symbol
-    // attached to the call.
-    // For interface methods, if the method is an implicit method corresponding to a method from
-    // java.lang.Object, the base symbol is for the java.lang.Object method.  We need this to
-    // properly treat the method as unannotated, which is particularly important for equals()
-    // methods.  This is an adaptation to a change in JDK 18; see
-    // https://bugs.openjdk.org/browse/JDK-8272564
-    // Also, sometimes we need the base symbol to properly deal with static imports; see
-    // https://github.com/uber/NullAway/issues/764
-    // We can remove this workaround once we require the version of Error Prone released after
-    // 2.24.1, to get
-    // https://github.com/google/error-prone/commit/e5a6d0d8f9f96bda8e9952b7817cd0d2b63e51be
-    return (Symbol.MethodSymbol) methodSymbol.baseSymbol();
-  }
-
   @Override
   public Description matchNewClass(NewClassTree tree, VisitorState state) {
     if (!withinAnnotatedCode(state)) {
       return Description.NO_MATCH;
     }
     Symbol.MethodSymbol methodSymbol = ASTHelpers.getSymbol(tree);
-    if (methodSymbol == null) {
-      throw new RuntimeException("not expecting unresolved method here");
-    }
     ExpressionTree enclosingExpression = tree.getEnclosingExpression();
     if (enclosingExpression != null) {
       // technically this is not a dereference; there is a requireNonNull() call in the
@@ -1275,7 +1249,7 @@ private Symbol.ClassSymbol enclosingClassSymbol(TreePath enclosingBlockPath) {
       Tree parent = enclosingBlockPath.getParentPath().getLeaf();
       return ASTHelpers.getSymbol((ClassTree) parent);
     } else {
-      return castToNonNull(ASTHelpers.enclosingClass(ASTHelpers.getSymbol(leaf)));
+      return castToNonNull(ASTHelpers.enclosingClass(castToNonNull(ASTHelpers.getSymbol(leaf))));
     }
   }
 

nullaway/src/main/java/com/uber/nullaway/NullAway.java

@@ -16,7 +16,7 @@
 package com.uber.nullaway.dataflow;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.uber.nullaway.ASTHelpersBackports.isStatic;
+import static com.google.errorprone.util.ASTHelpers.isStatic;
 import static com.uber.nullaway.NullabilityUtil.castToNonNull;
 import static com.uber.nullaway.Nullness.BOTTOM;
 import static com.uber.nullaway.Nullness.NONNULL;