Test reading JSpecify annotations from bytecodes on JDK 21 (#1245)

As of JDK 21.0.8, the patch to properly expose type use annotations via
standard APIs has landed, [guarded behind the flag
`-XDaddTypeAnnotationsToSymbol=true`](openjdk/jdk21u@bb83d59).
This PR runs the relevant tests on JDK 21 by passing that flag where
needed. This means NullAway regression tests will fail on versions of
JDK 21 older than 21.0.8, but we can document that.

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

## Summary by CodeRabbit

- New Features
- Improved compatibility with newer JDKs (21+), enabling enhanced
type-annotation handling where available.
- Tests
- Expanded test coverage by removing version-based exclusions and adding
runtime guards for newer JDKs.
- Updated test setup to conditionally enable features on supported JDK
versions.
- Chores
- Simplified build configuration by eliminating Java-version-specific
test filtering.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Author: msridhar

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

@@ -24,6 +24,7 @@
 import com.google.errorprone.CompilationTestHelper;
 import com.uber.nullaway.NullAway;
 import java.util.Arrays;
+import java.util.List;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Rule;
@@ -57,11 +58,12 @@ public void setup() {
     jspecifyCompilationHelper =
         CompilationTestHelper.newInstance(NullAway.class, getClass())
             .setArgs(
-                Arrays.asList(
+                List.of(
                     "-d",
                     temporaryFolder.getRoot().getAbsolutePath(),
                     "-XepOpt:NullAway:OnlyNullMarked=true",
-                    "-XepOpt:NullAway:JSpecifyMode=true"));
+                    "-XepOpt:NullAway:JSpecifyMode=true",
+                    "-XDaddTypeAnnotationsToSymbol=true"));
   }
 
   @Test
@@ -92,7 +94,7 @@ public void testFutureCallbackParametricNullness() {
   @Test
   public void jspecifyFutureCallback() {
     // to ensure javac reads proper generic types from the Guava jar
-    Assume.assumeTrue(Runtime.version().feature() >= 23);
+    Assume.assumeTrue(Runtime.version().feature() >= 21);
     jspecifyCompilationHelper
         .addSourceLines(
             "Test.java",
@@ -140,7 +142,7 @@ public void testIterableParametricNullness() {
   @Test
   public void jspecifyIterables() {
     // to ensure javac reads proper generic types from the Guava jar
-    Assume.assumeTrue(Runtime.version().feature() >= 23);
+    Assume.assumeTrue(Runtime.version().feature() >= 21);
     jspecifyCompilationHelper
         .addSourceLines(
             "Test.java",
@@ -170,7 +172,7 @@ public void jspecifyIterables() {
   @Test
   public void jspecifyComparators() {
     // to ensure javac reads proper generic types from the Guava jar
-    Assume.assumeTrue(Runtime.version().feature() >= 23);
+    Assume.assumeTrue(Runtime.version().feature() >= 21);
     jspecifyCompilationHelper
         .addSourceLines(
             "Test.java",
@@ -252,7 +254,7 @@ public void testFunctionMethodOverride() {
   @Test
   public void newHashSetPassingNullable() {
     // to ensure javac reads proper generic types from the Guava jar
-    Assume.assumeTrue(Runtime.version().feature() >= 23);
+    Assume.assumeTrue(Runtime.version().feature() >= 21);
     jspecifyCompilationHelper
         .addSourceLines(
             "Test.java",

nullaway/build.gradle

@@ -187,15 +187,6 @@ project.tasks.named('check').configure {
 }
 
 tasks.withType(Test).configureEach { test ->
-    if (test.javaVersion < JavaVersion.VERSION_22) {
-        // Certain tests involving reading annotations from bytecode will not pass on pre-JDK-22 javac
-        // until the fix for https://bugs.openjdk.org/browse/JDK-8225377 is backported or until we add
-        // workarounds.  See https://github.com/uber/NullAway/issues/1005.
-        test.filter {
-            excludeTestsMatching "com.uber.nullaway.jspecify.BytecodeGenericsTests.genericsChecksForParamPassingAndReturns"
-            excludeTestsMatching "com.uber.nullaway.jspecify.BytecodeGenericsTests.genericsChecksForFieldAssignments"
-        }
-    }
     // hack: for some reasons the ErrorProneCLIFlagsConfigTest does not pass on EP 2.31.0,
     // though it passes on both older and newer Error Prone versions (???).  Not worth tracking
     // down

nullaway/src/test/java/com/uber/nullaway/NullAwayTestsBase.java

@@ -1,7 +1,6 @@
 package com.uber.nullaway;
 
 import com.google.errorprone.CompilationTestHelper;
-import java.util.Arrays;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Rule;
@@ -17,7 +16,7 @@ public abstract class NullAwayTestsBase {
   public void setup() {
     defaultCompilationHelper =
         makeTestHelperWithArgs(
-            Arrays.asList(
+            List.of(
                 "-d",
                 temporaryFolder.getRoot().getAbsolutePath(),
                 "-XepOpt:NullAway:KnownInitializers="
@@ -33,7 +32,8 @@ public void setup() {
                 "-XepOpt:NullAway:ExcludedClassAnnotations=com.uber.nullaway.testdata.TestAnnot",
                 "-XepOpt:NullAway:CastToNonNullMethod=com.uber.nullaway.testdata.Util.castToNonNull",
                 "-XepOpt:NullAway:ExternalInitAnnotations=com.uber.ExternalInit",
-                "-XepOpt:NullAway:ExcludedFieldAnnotations=com.uber.ExternalFieldInit"));
+                "-XepOpt:NullAway:ExcludedFieldAnnotations=com.uber.ExternalFieldInit",
+                "-XDaddTypeAnnotationsToSymbol=true"));
   }
 
   /**

nullaway/src/test/java/com/uber/nullaway/jspecify/BytecodeGenericsTests.java

@@ -2,8 +2,8 @@
 
 import com.google.errorprone.CompilationTestHelper;
 import com.uber.nullaway.NullAwayTestsBase;
-import java.util.Arrays;
-import org.junit.Ignore;
+import java.util.List;
+import org.junit.Assume;
 import org.junit.Test;
 
 public class BytecodeGenericsTests extends NullAwayTestsBase {
@@ -76,6 +76,8 @@ public void genericsChecksForAssignments() {
 
   @Test
   public void genericsChecksForFieldAssignments() {
+    // to read annotations properly from bytecode
+    Assume.assumeTrue(Runtime.version().feature() >= 21);
     makeHelper()
         .addSourceLines(
             "Test.java",
@@ -99,6 +101,9 @@ public void genericsChecksForFieldAssignments() {
 
   @Test
   public void genericsChecksForParamPassingAndReturns() {
+    // to read annotations properly from bytecode
+    Assume.assumeTrue(Runtime.version().feature() >= 21);
+
     makeHelper()
         .addSourceLines(
             "Test.java",
@@ -224,10 +229,9 @@ public void overrideReturnTypes() {
   }
 
   @Test
-  @Ignore("Failing due to https://bugs.openjdk.org/browse/JDK-8337795")
-  // TODO Re-enable this test once the JDK bug is fixed, on appropriate JDK versions
-  //  See https://github.com/uber/NullAway/issues/1011
   public void callMethodTakingJavaUtilFunction() {
+    // to read annotations properly from bytecode
+    Assume.assumeTrue(Runtime.version().feature() >= 21);
     makeHelper()
         .addSourceLines(
             "Test.java",
@@ -244,7 +248,9 @@ public void callMethodTakingJavaUtilFunction() {
 
   private CompilationTestHelper makeHelper() {
     return makeTestHelperWithArgs(
-        Arrays.asList(
-            "-XepOpt:NullAway:AnnotatedPackages=com.uber", "-XepOpt:NullAway:JSpecifyMode=true"));
+        List.of(
+            "-XepOpt:NullAway:AnnotatedPackages=com.uber",
+            "-XepOpt:NullAway:JSpecifyMode=true",
+            "-XDaddTypeAnnotationsToSymbol=true"));
   }
 }