Annotate the rest of the main package (basically just the Java 8 subjects) for nullness.

And move the `@NullMarked` annotation from individual classes up to the package.

Motivation:
- The annotating is about potentially making things nicer for callers (or any future J2KT use?).
- Moving `@NullMarked` to the package is about saving Truth users from [a warning when running Error Prone with `--release 8`](#1320): When `@NullMarked` appears on a _class_, Error Prone processes the entire `NullMarked` class in order to check whether `NullMarked` is `@Inherited`. This leads to `warning: unknown enum constant ElementType.MODULE` because `NullMarked` has `@Target(MODULE, ...)` but `MODULE` isn't available until Java 9. We'll also be fixing this on the Error Prone side, but we might as well work around it on the Truth side, too—and annotate the rest of Truth while we're at it.

(In principle, I should now add `@NullUnmarked` to all of Truth's test classes, since they haven't been annotated. But doing so would have little to no effect in practice unless maybe IntelliJ recognizes `@NullUnmarked` (probably not now?) or we improve our nullness offerings in Error Prone. I'm planning to not bother, but let me know if I'm being overly lazy.)

Note that this CL applies `@Nullable` to some assertion methods' parameters even though those assertions would always fail if the callers passed `null`. This follows a principle that we'd applied (albeit incompletely) in cl/516515683, which showed that such changes avoided producing build errors in existing, working code. The principle is the same as that discussed for `EqualsTester` in cl/578260904.

Fixes #1320

RELNOTES=Annotated the rest of the main package for nullness, and moved the `@NullMarked` annotation from individual classes up to the package to avoid [a warning under `--release 8`](#1320).
PiperOrigin-RevId: 651891918

Author: cpovirk

core/src/main/java/com/google/common/truth/AbstractArraySubject.java

@@ -20,15 +20,13 @@
 import static com.google.common.truth.Fact.simpleFact;
 
 import java.lang.reflect.Array;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * A common supertype for Array subjects, abstracting some common display and error infrastructure.
  *
  * @author Christian Gruber ([email protected])
  */
-@NullMarked
 abstract class AbstractArraySubject extends Subject {
   private final @Nullable Object actual;
 

core/src/main/java/com/google/common/truth/ActualValueInference.java

@@ -33,7 +33,6 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Map.Entry;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
@@ -70,7 +69,6 @@
  */
 @GwtIncompatible
 @J2ktIncompatible
-@NullMarked
 final class ActualValueInference {
   /** <b>Call {@link Platform#inferDescription} rather than calling this directly.</b> */
   static @Nullable String describeActualValue(String className, String methodName, int lineNumber) {

core/src/main/java/com/google/common/truth/AssertionErrorWithFacts.java

@@ -19,15 +19,13 @@
 import static com.google.common.truth.Fact.makeMessage;
 
 import com.google.common.collect.ImmutableList;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * An {@link AssertionError} composed of structured {@link Fact} instances and other string
  * messages.
  */
 @SuppressWarnings("OverrideThrowableToString") // We intentionally hide the class name.
-@NullMarked
 final class AssertionErrorWithFacts extends AssertionError implements ErrorWithFacts {
   private final ImmutableList<Fact> facts;
 

core/src/main/java/com/google/common/truth/BigDecimalSubject.java

@@ -20,15 +20,13 @@
 import static com.google.common.truth.Fact.simpleFact;
 
 import java.math.BigDecimal;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * Propositions for {@link BigDecimal} typed subjects.
  *
  * @author Kurt Alfred Kluever
  */
-@NullMarked
 public final class BigDecimalSubject extends ComparableSubject<BigDecimal> {
   private final @Nullable BigDecimal actual;
 

core/src/main/java/com/google/common/truth/BooleanSubject.java

@@ -17,15 +17,13 @@
 
 import static com.google.common.truth.Fact.simpleFact;
 
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * Propositions for boolean subjects.
  *
  * @author Christian Gruber ([email protected])
  */
-@NullMarked
 public final class BooleanSubject extends Subject {
   private final @Nullable Boolean actual;
 

core/src/main/java/com/google/common/truth/ClassSubject.java

@@ -18,15 +18,13 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.annotations.GwtIncompatible;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * Propositions for {@link Class} subjects.
  *
  * @author Kurt Alfred Kluever
  */
-@NullMarked
 @GwtIncompatible("reflection")
 @J2ktIncompatible
 public final class ClassSubject extends Subject {

core/src/main/java/com/google/common/truth/ComparableSubject.java

@@ -18,7 +18,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.Range;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -27,7 +26,6 @@
  * @author Kurt Alfred Kluever
  * @param <T> the type of the object being tested by this {@code ComparableSubject}
  */
-@NullMarked
 // TODO(b/136040841): Consider further tightening this to the proper `extends Comparable<? super T>`
 public abstract class ComparableSubject<T extends Comparable<?>> extends Subject {
   /**

core/src/main/java/com/google/common/truth/ComparisonFailureWithFacts.java

@@ -21,14 +21,12 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.truth.Platform.PlatformComparisonFailure;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * An {@link AssertionError} (usually a JUnit {@code ComparisonFailure}, but not under GWT) composed
  * of structured {@link Fact} instances and other string messages.
  */
-@NullMarked
 final class ComparisonFailureWithFacts extends PlatformComparisonFailure implements ErrorWithFacts {
   private final ImmutableList<Fact> facts;
 

core/src/main/java/com/google/common/truth/ComparisonFailures.java

@@ -26,7 +26,6 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -43,7 +42,6 @@
  * different implementation under GWT/j2cl, where {@code ComparisonFailure} is also unavailable but
  * we can't just recover from that at runtime.
  */
-@NullMarked
 final class ComparisonFailures {
   static ImmutableList<Fact> makeComparisonFailureFacts(
       ImmutableList<Fact> headFacts,

core/src/main/java/com/google/common/truth/Correspondence.java

@@ -31,7 +31,6 @@
 import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
 import java.util.List;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -66,7 +65,6 @@
  *
  * @author Pete Gillin
  */
-@NullMarked
 public abstract class Correspondence<A extends @Nullable Object, E extends @Nullable Object> {
 
   /**

core/src/main/java/com/google/common/truth/CustomSubjectBuilder.java

@@ -18,8 +18,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.jspecify.annotations.NullMarked;
-
 /**
  * In a fluent assertion chain, exposes one or more "custom" {@code that} methods, which accept a
  * value under test and return a {@link Subject}.
@@ -36,7 +34,6 @@
  * extensions</a>. It explains the cases in which {@code CustomSubjectBuilder} is necessary, and it
  * links to further instructions.
  */
-@NullMarked
 public abstract class CustomSubjectBuilder {
   /**
    * In a fluent assertion chain, the argument to the "custom" overload of {@link

core/src/main/java/com/google/common/truth/DiffUtils.java

@@ -23,15 +23,13 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * A custom implementation of the diff algorithm based on the solution described at
  * https://en.wikipedia.org/wiki/Longest_common_subsequence_problem
  *
  * @author Yun Peng ([email protected])
  */
-@NullMarked
 final class DiffUtils {
   // A list of unique strings appeared in compared texts.
   // The index of each string is its incremental Id.

core/src/main/java/com/google/common/truth/DoubleSubject.java

@@ -26,15 +26,13 @@
 import static java.lang.Double.NaN;
 import static java.lang.Double.doubleToLongBits;
 
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * Propositions for {@link Double} subjects.
  *
  * @author Kurt Alfred Kluever
  */
-@NullMarked
 public final class DoubleSubject extends ComparableSubject<Double> {
   private static final long NEG_ZERO_BITS = doubleToLongBits(-0.0);
 

core/src/main/java/com/google/common/truth/ErrorWithFacts.java

@@ -17,13 +17,11 @@
 package com.google.common.truth;
 
 import com.google.common.collect.ImmutableList;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Supertype of Truth's {@link AssertionError} subclasses that are created from a list of {@link
  * Fact} instances.
  */
-@NullMarked
 interface ErrorWithFacts {
   ImmutableList<Fact> facts();
 }

core/src/main/java/com/google/common/truth/Expect.java

@@ -30,7 +30,6 @@
 import com.google.errorprone.annotations.concurrent.GuardedBy;
 import java.util.ArrayList;
 import java.util.List;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 import org.junit.internal.AssumptionViolatedException;
 import org.junit.rules.ErrorCollector;
@@ -84,7 +83,6 @@
  */
 @GwtIncompatible("JUnit4")
 @J2ktIncompatible
-@NullMarked
 public final class Expect extends StandardSubjectBuilder implements TestRule {
 
   private static final class ExpectationGatherer implements FailureStrategy {

core/src/main/java/com/google/common/truth/ExpectFailure.java

@@ -24,7 +24,6 @@
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.truth.Truth.SimpleAssertionError;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
@@ -67,7 +66,6 @@
  * also checks that the assertion you're testing uses the supplied {@link FailureStrategy} and calls
  * {@link FailureStrategy#fail} only once.
  */
-@NullMarked
 public final class ExpectFailure implements Platform.JUnitTestRule {
   private boolean inRuleContext = false;
   private boolean failureExpected = false;

core/src/main/java/com/google/common/truth/Fact.java

@@ -22,7 +22,6 @@
 
 import com.google.common.collect.ImmutableList;
 import java.io.Serializable;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -35,7 +34,6 @@
  * <p>If you are writing a custom {@code Subject}, see <a
  * href="https://truth.dev/failure_messages">our tips on writing failure messages</a>.
  */
-@NullMarked
 public final class Fact implements Serializable {
   /**
    * Creates a fact with the given key and value, which will be printed in a format like "key:

core/src/main/java/com/google/common/truth/FailureMetadata.java

@@ -29,7 +29,6 @@
 
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -52,7 +51,6 @@
  * using their {@link CustomSubjectBuilder#metadata()} method to get an instance to pass to the
  * constructor.)
  */
-@NullMarked
 public final class FailureMetadata {
   static FailureMetadata forFailureStrategy(FailureStrategy failureStrategy) {
     return new FailureMetadata(

core/src/main/java/com/google/common/truth/FailureStrategy.java

@@ -15,7 +15,6 @@
  */
 package com.google.common.truth;
 
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Defines what to do when a check fails.
@@ -54,7 +53,6 @@
  * StandardSubjectBuilder#forCustomFailureStrategy
  * StandardSubjectBuilder.forCustomFailureStrategy(STRATEGY)}.
  */
-@NullMarked
 public interface FailureStrategy {
   /**
    * Handles a failure. The parameter is an {@code AssertionError} or subclass thereof, and it

core/src/main/java/com/google/common/truth/FloatSubject.java

@@ -26,15 +26,13 @@
 import static java.lang.Float.NaN;
 import static java.lang.Float.floatToIntBits;
 
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
  * Propositions for {@link Float} subjects.
  *
  * @author Kurt Alfred Kluever
  */
-@NullMarked
 public final class FloatSubject extends ComparableSubject<Float> {
   private static final int NEG_ZERO_BITS = floatToIntBits(-0.0f);
 

core/src/main/java/com/google/common/truth/GraphMatching.java

@@ -27,15 +27,13 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Queue;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Helper routines related to <a href="https://en.wikipedia.org/wiki/Matching_(graph_theory)">graph
  * matchings</a>.
  *
  * @author Pete Gillin
  */
-@NullMarked
 final class GraphMatching {
 
   /**

core/src/main/java/com/google/common/truth/GuavaOptionalSubject.java

@@ -19,7 +19,6 @@
 import static com.google.common.truth.Fact.simpleFact;
 
 import com.google.common.base.Optional;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -29,7 +28,6 @@
  *
  * @author Christian Gruber
  */
-@NullMarked
 public final class GuavaOptionalSubject extends Subject {
   @SuppressWarnings("NullableOptional") // Truth always accepts nulls, no matter the type
   private final @Nullable Optional<?> actual;

core/src/main/java/com/google/common/truth/IgnoreJRERequirement.java

@@ -21,11 +21,9 @@
 import static java.lang.annotation.ElementType.TYPE;
 
 import java.lang.annotation.Target;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Disables Animal Sniffer's checking of compatibility with older versions of Java/Android.
  */
 @Target({METHOD, CONSTRUCTOR, TYPE})
-@NullMarked
 @interface IgnoreJRERequirement {}