Explicitly annotate some null-unmarked classes as @NullUnmarked.

This is redundant for now, though it is arguably nice to be explicit. However, my actual motivation is that I expect to use a package-level `@NullMarked` annotation (contrary to my usual recommendation) in order to help external Java 8 users whose tools might be upset by the `@Target(..., MODULE)` that they are more likely to discover if `@NullMarked` appears on individual classes.

RELNOTES=n/a
PiperOrigin-RevId: 707946250

android/guava-testlib/src/com/google/common/testing/ClassSanityTester.java

@@ -53,6 +53,7 @@
 import javax.annotation.CheckForNull;
 import junit.framework.Assert;
 import junit.framework.AssertionFailedError;
+import org.jspecify.annotations.NullUnmarked;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -81,6 +82,8 @@
  */
 @GwtIncompatible
 @J2ktIncompatible
+@NullUnmarked
+@SuppressWarnings("nullness")
 public final class ClassSanityTester {
 
   private static final Ordering<Invokable<?, ?>> BY_METHOD_NAME =

android/guava-testlib/src/com/google/common/testing/FreshValueGenerator.java

@@ -121,6 +121,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 import javax.annotation.CheckForNull;
+import org.jspecify.annotations.NullUnmarked;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -130,6 +131,8 @@
  */
 @GwtIncompatible
 @J2ktIncompatible
+@NullUnmarked
+@SuppressWarnings("nullness")
 class FreshValueGenerator {
 
   private static final ImmutableMap<Class<?>, Method> GENERATORS;

android/guava-testlib/test/com/google/common/testing/AbstractPackageSanityTestsTest.java

@@ -23,12 +23,14 @@
 import java.util.Arrays;
 import java.util.List;
 import junit.framework.TestCase;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Unit tests for {@link AbstractPackageSanityTests}.
  *
  * @author Ben Yu
  */
+@NullUnmarked
 public class AbstractPackageSanityTestsTest extends TestCase {
   /*
    * This is a public type so that the Android test runner can create an instance directly as it

android/guava-testlib/test/com/google/common/testing/ArbitraryInstancesTest.java

@@ -129,13 +129,15 @@
 import java.util.regex.MatchResult;
 import java.util.regex.Pattern;
 import junit.framework.TestCase;
+import org.jspecify.annotations.NullUnmarked;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Unit test for {@link ArbitraryInstances}.
  *
  * @author Ben Yu
  */
+@NullUnmarked
 public class ArbitraryInstancesTest extends TestCase {
 
   public void testGet_primitives() {

android/guava-testlib/test/com/google/common/testing/EqualsTesterTest.java

@@ -26,6 +26,7 @@
 import java.util.Set;
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
+import org.jspecify.annotations.NullUnmarked;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -35,6 +36,7 @@
  */
 @GwtCompatible
 @SuppressWarnings("MissingTestCall")
+@NullUnmarked
 public class EqualsTesterTest extends TestCase {
   private ValidTestObject reference;
   private EqualsTester equalsTester;

android/guava-testlib/test/com/google/common/testing/EquivalenceTesterTest.java

@@ -27,13 +27,15 @@
 import com.google.common.collect.ImmutableTable;
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Tests for {@link EquivalenceTester}.
  *
  * @author Gregory Kick
  */
 @GwtCompatible
+@NullUnmarked
 public class EquivalenceTesterTest extends TestCase {
   private EquivalenceTester<Object> tester;
   private MockEquivalence equivalenceMock;

android/guava-testlib/test/com/google/common/testing/FakeTickerTest.java

@@ -31,6 +31,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import junit.framework.TestCase;
+import org.jspecify.annotations.NullUnmarked;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -41,6 +42,7 @@
 @GwtCompatible(emulated = true)
 // We also want to test the TimeUnit overload (especially under GWT, where it's the only option).
 @SuppressWarnings("SetAutoIncrementStep_Nanos")
+@NullUnmarked
 public class FakeTickerTest extends TestCase {
 
   @GwtIncompatible // NullPointerTester

android/guava-testlib/test/com/google/common/testing/FreshValueGeneratorTest.java

@@ -106,12 +106,14 @@
 import java.util.regex.MatchResult;
 import java.util.regex.Pattern;
 import junit.framework.TestCase;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Tests for {@link FreshValueGenerator}.
  *
  * @author Ben Yu
  */
+@NullUnmarked
 public class FreshValueGeneratorTest extends TestCase {
 
   @AndroidIncompatible // problem with equality of Type objects?

android/guava-testlib/test/com/google/common/testing/GcFinalizationTest.java

@@ -26,6 +26,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import junit.framework.TestCase;
+import org.jspecify.annotations.NullUnmarked;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -36,6 +37,7 @@
  */
 @AndroidIncompatible // depends on details of gc
 
+@NullUnmarked
 public class GcFinalizationTest extends TestCase {
 
   // ----------------------------------------------------------------

android/guava-testlib/test/com/google/common/testing/PackageSanityTests.java

@@ -16,7 +16,9 @@
 
 package com.google.common.testing;
 
+import org.jspecify.annotations.NullUnmarked;
 
 /** Test nulls for the entire package. */
 
+@NullUnmarked
 public class PackageSanityTests extends AbstractPackageSanityTests {}

android/guava-testlib/test/com/google/common/testing/RelationshipTesterTest.java

@@ -18,12 +18,14 @@
 
 import com.google.common.testing.RelationshipTester.ItemReporter;
 import junit.framework.TestCase;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Tests for {@link RelationshipTester}.
  *
  * @author Ben Yu
  */
+@NullUnmarked
 public class RelationshipTesterTest extends TestCase {
 
   public void testNulls() {

android/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java

@@ -19,13 +19,15 @@
 import java.io.Serializable;
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
+import org.jspecify.annotations.NullUnmarked;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * Tests for {@link SerializableTester}.
  *
  * @author Nick Kralevich
  */
+@NullUnmarked
 public class SerializableTesterTest extends TestCase {
   public void testStringAssertions() {
     String original = "hello world";

android/guava-testlib/test/com/google/common/testing/TearDownStackTest.java

@@ -20,10 +20,14 @@
 
 import com.google.common.annotations.GwtCompatible;
 import junit.framework.TestCase;
+import org.jspecify.annotations.NullUnmarked;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-/** @author Luiz-Otavio "Z" Zorzella */
+/**
+ * @author Luiz-Otavio "Z" Zorzella
+ */
 @GwtCompatible
+@NullUnmarked
 public class TearDownStackTest extends TestCase {
 
   private TearDownStack tearDownStack = new TearDownStack();

android/guava-testlib/test/com/google/common/testing/TestLogHandlerTest.java

@@ -20,12 +20,14 @@
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 import junit.framework.TestCase;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Unit test for {@link TestLogHandler}.
  *
  * @author kevinb
  */
+@NullUnmarked
 public class TestLogHandlerTest extends TestCase {
 
   private TestLogHandler handler;

android/guava-tests/benchmark/com/google/common/base/AsciiBenchmark.java

@@ -25,12 +25,14 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Random;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Benchmarks for the ASCII class.
  *
  * @author Kevin Bourrillion
  */
+@NullUnmarked
 public class AsciiBenchmark {
   private static final String ALPHA = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
   private static final String NONALPHA = "0123456789`~-_=+[]{}|;:',.<>/?!@#$%^&*()\"\\";

android/guava-tests/benchmark/com/google/common/base/CharMatcherBenchmark.java

@@ -25,6 +25,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Benchmark for the {@link CharMatcher} class.
@@ -33,6 +34,7 @@
  * @author Kevin Bourrillion
  * @author David Richter
  */
+@NullUnmarked
 public class CharMatcherBenchmark {
 
   // Caliper injects params automatically

android/guava-tests/benchmark/com/google/common/base/EnumsBenchmark.java

@@ -22,8 +22,10 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import org.jspecify.annotations.NullUnmarked;
 
 @SuppressWarnings("unused") // Nested enums used reflectively in setUp.
+@NullUnmarked
 public class EnumsBenchmark {
 
   @Param({"Small", "Medium", "Large"})

android/guava-tests/benchmark/com/google/common/base/JoinerBenchmark.java

@@ -21,12 +21,14 @@
 import com.google.caliper.Param;
 import java.util.Arrays;
 import java.util.Iterator;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Benchmarks {@link Joiner} against some common implementations of delimiter-based string joining.
  *
  * @author Adomas Paltanavicius
  */
+@NullUnmarked
 public class JoinerBenchmark {
 
   private static final String DELIMITER_STRING = ",";

android/guava-tests/benchmark/com/google/common/base/LazyStackTraceBenchmark.java

@@ -24,11 +24,13 @@
 import com.google.caliper.Param;
 import com.google.caliper.api.SkipThisScenarioException;
 import java.util.List;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Quick and dirty benchmark of {@link Throwables#lazyStackTrace(Throwable)}. We benchmark a "caller
  * finder" implementation that might be used in a logging framework.
  */
+@NullUnmarked
 public class LazyStackTraceBenchmark {
   @Param({"20", "200", "2000"})
   int stackDepth;

android/guava-tests/benchmark/com/google/common/base/ObjectsBenchmark.java

@@ -17,12 +17,14 @@
 package com.google.common.base;
 
 import com.google.caliper.Benchmark;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Some microbenchmarks for the {@link com.google.common.base.Objects} class.
  *
  * @author Ben L. Titzer
  */
+@NullUnmarked
 public class ObjectsBenchmark {
 
   private static final Integer I0 = -45;

android/guava-tests/benchmark/com/google/common/base/SplitterBenchmark.java

@@ -20,12 +20,14 @@
 import com.google.caliper.Benchmark;
 import com.google.caliper.Param;
 import com.google.common.collect.Iterables;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Microbenchmark for {@link Splitter#on} with char vs String with length == 1.
  *
  * @author Paul Lindner
  */
+@NullUnmarked
 public class SplitterBenchmark {
   // overall size of string
   @Param({"1", "10", "100", "1000"})

android/guava-tests/benchmark/com/google/common/base/StopwatchBenchmark.java

@@ -19,13 +19,15 @@
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 import com.google.caliper.Benchmark;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Simple benchmark: create, start, read. This does not currently report the most useful result
  * because it's ambiguous to what extent the stopwatch benchmark is being affected by GC.
  *
  * @author Kevin Bourrillion
  */
+@NullUnmarked
 public class StopwatchBenchmark {
   @Benchmark
   long stopwatch(int reps) {

android/guava-tests/benchmark/com/google/common/base/StringsRepeatBenchmark.java

@@ -19,12 +19,14 @@
 import com.google.caliper.BeforeExperiment;
 import com.google.caliper.Benchmark;
 import com.google.caliper.Param;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Microbenchmark for {@link com.google.common.base.Strings#repeat}
  *
  * @author Mike Cripps
  */
+@NullUnmarked
 public class StringsRepeatBenchmark {
   @Param({"1", "5", "25", "125"})
   int count;

android/guava-tests/benchmark/com/google/common/base/ToStringHelperBenchmark.java

@@ -20,12 +20,14 @@
 import com.google.caliper.Param;
 import java.util.Arrays;
 import java.util.Collections;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Some microbenchmarks for the {@link MoreObjects.ToStringHelper} class.
  *
  * @author Osvaldo Doederlein
  */
+@NullUnmarked
 public class ToStringHelperBenchmark {
 
   @Param({"0", "1", "5"})

android/guava-tests/benchmark/com/google/common/base/WhitespaceMatcherBenchmark.java

@@ -21,8 +21,10 @@
 import com.google.caliper.Param;
 import java.util.BitSet;
 import java.util.Random;
+import org.jspecify.annotations.NullUnmarked;
 
 /** Benchmark for the {@link CharMatcher#whitespace} implementation. */
+@NullUnmarked
 public class WhitespaceMatcherBenchmark {
   private static final int STRING_LENGTH = 10000;
 

android/guava-tests/benchmark/com/google/common/cache/ChainBenchmark.java

@@ -20,6 +20,7 @@
 import com.google.caliper.Benchmark;
 import com.google.caliper.Param;
 import com.google.common.cache.LocalCache.Segment;
+import org.jspecify.annotations.NullUnmarked;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -28,6 +29,7 @@
  * @author Charles Fry
  */
 @SuppressWarnings("CheckReturnValue")
+@NullUnmarked
 public class ChainBenchmark {
 
   @Param({"1", "2", "3", "4", "5", "6"})