Add support for -XepOpt:NullAway:ExtraFuturesClasses

README.md

@@ -103,6 +103,7 @@ Each property (except for `severity`) maps to an `-XepOpt:NullAway:[propertyName
 | `customNonnullAnnotations`     | A list of annotations that should be considered equivalent to `@NonNull` annotations, for the cases where NullAway cares about such annotations (see e.g. `acknowledgeRestrictiveAnnotations`).
 | `customGeneratedCodeAnnotations` | A list of annotations that should be considered equivalent to `@Generated` annotations, for the cases where NullAway cares about such annotations (see e.g. `treatGeneratedAsUnannotated`).
 | `jspecifyMode`                   | (`isJSpecifyMode` with Kotlin DSL) If set to true, enables new checks based on JSpecify (like checks for generic types).
+| `extraFuturesClasses`            | A list of classes to be treated equivalently to Guava `Futures` and `FluentFuture`; this special support will likely be removed once NullAway's JSpecify support is more complete.
 
 ### Methods
 

src/main/kotlin/net/ltgt/gradle/nullaway/NullAwayOptions.kt

@@ -173,6 +173,14 @@ open class NullAwayOptions internal constructor(
     @get:Optional
     val isJSpecifyMode = objectFactory.property<Boolean>()
 
+    /**
+     * A list of classes to be treated equivalently to Guava `Futures` and `FluentFuture`; maps to `-XepOpt:NullAway:ExtraFuturesClasses`.
+     *
+     * This special support will likely be removed once NullAway's JSpecify support is more complete.
+     */
+    @get:Input @get:Optional
+    val extraFuturesClasses = objectFactory.listProperty<String>()
+
     /**
      * Enable NullAway.
      *
@@ -229,6 +237,7 @@ open class NullAwayOptions internal constructor(
         listOption("CustomNonnullAnnotations", customNonnullAnnotations),
         listOption("CustomGeneratedCodeAnnotations", customGeneratedCodeAnnotations),
         booleanOption("JSpecifyMode", isJSpecifyMode),
+        listOption("ExtraFuturesClasses", extraFuturesClasses),
     )
         .filterNotNull()
         .asIterable()

src/test/kotlin/net/ltgt/gradle/nullaway/Fixtures.kt

@@ -12,7 +12,7 @@ val testGradleVersion = System.getProperty("test.gradle-version", GradleVersion.
 
 val errorproneVersion = System.getProperty("errorprone.version")!!
 
-const val nullawayVersion = "0.10.10"
+const val nullawayVersion = "0.10.23"
 
 const val FAILURE_SOURCE_COMPILATION_ERROR = "Failure.java:8: warning: [NullAway]"
 

src/test/kotlin/net/ltgt/gradle/nullaway/GroovyDslIntegrationTest.kt

@@ -120,6 +120,7 @@ class GroovyDslIntegrationTest {
                     customNonnullAnnotations = ["com.example.MustNotBeNull"]
                     customGeneratedCodeAnnotations = ["com.example.Generated"]
                     jspecifyMode = true
+                    extraFuturesClasses = ["com.example.Future"]
                 }
             }
             """.trimIndent(),

src/test/kotlin/net/ltgt/gradle/nullaway/NullAwayOptionsTest.kt

@@ -48,6 +48,7 @@ class NullAwayOptionsTest {
             "NullAway:CustomNonnullAnnotations",
             "NullAway:CustomGeneratedCodeAnnotations",
             "NullAway:JSpecifyMode",
+            "NullAway:ExtraFuturesClasses",
         )
     }
 
@@ -95,6 +96,7 @@ class NullAwayOptionsTest {
         doTestOptions { customNonnullAnnotations.add("com.example.MustNotBeNull") }
         doTestOptions { customGeneratedCodeAnnotations.add("com.example.Generated") }
         doTestOptions { isJSpecifyMode.set(true) }
+        doTestOptions { extraFuturesClasses.add("com.example.Future") }
 
         doTestOptions {
             enable()
@@ -124,6 +126,7 @@ class NullAwayOptionsTest {
             customNonnullAnnotations.add("com.example.MustNotBeNull")
             customGeneratedCodeAnnotations.add("com.example.Generated")
             isJSpecifyMode.set(true)
+            extraFuturesClasses.add("com.example.Future")
         }
     }
 
@@ -182,6 +185,7 @@ class NullAwayOptionsTest {
         assertListOptionEqual(parsedOptions, "NullAway:CustomNonnullAnnotations", options.customNonnullAnnotations)
         assertListOptionEqual(parsedOptions, "NullAway:CustomGeneratedCodeAnnotations", options.customGeneratedCodeAnnotations)
         assertBooleanOptionEqual(parsedOptions, "NullAway:JSpecifyMode", options.isJSpecifyMode)
+        assertListOptionEqual(parsedOptions, "NullAway:ExtraFuturesClasses", options.extraFuturesClasses)
 
         assertThat(parsedOptions.flags.flagsMap.keys - ALL_NULLAWAY_OPTION_NAMES).isEmpty()
         assertThat(parsedOptions.remainingArgs).isEmpty()

src/test/kotlin/net/ltgt/gradle/nullaway/NullAwayPluginIntegrationTest.kt

@@ -161,6 +161,7 @@ class NullAwayPluginIntegrationTest {
                     customNullableAnnotations.add("com.example.CouldBeNull")
                     customNonnullAnnotations.add("com.example.MustNotBeNull")
                     isJSpecifyMode.set(true)
+                    extraFuturesClasses.add("com.example.Future")
                 }
             }
             """.trimIndent(),