Disable Java7ApiChecker for our *tests*, removing most of its suppr…

…essions and also most `AndroidJdkLibsChecker` suppressions.

(`AndroidJdkLibsChecker` (albeit in "desugaring mode") and Animal Sniffer will continue to run.)

It's not clear that `Java7ApiChecker` is useful even for our *prod* code at this point, as discussed in b/336133887. Let's at least start by disabling it for tests, where it's one of the remaining annoyances when adding support for Java 8 APIs to our Android branch.

(The actual immediate motivation for this CL is cl/686562711.)

The _`AndroidJdkLibsChecker`_ suppressions can be removed now that the standard configuration inside Google enables opt-in library desugaring, which signals to `AndroidJdkLibsChecker` not to warn about the methods that we're using. (Again, we still have checking from Animal Sniffer.)

RELNOTES=n/a
PiperOrigin-RevId: 686638643

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

@@ -44,7 +44,6 @@ public void testNullPointerExceptions() {
   }
 
   @GwtIncompatible // java.time.Duration
-  @SuppressWarnings("Java7ApiChecker") // guava-android can rely on library desugaring now.
   @IgnoreJRERequirement // TODO: b/288085449 - Remove this once we use library-desugaring scents.
   public void testAdvance() {
     FakeTicker ticker = new FakeTicker();
@@ -84,7 +83,6 @@ public void testAutoIncrementStep_seconds() {
   }
 
   @GwtIncompatible // java.time.Duration
-  @SuppressWarnings("Java7ApiChecker") // guava-android can rely on library desugaring now.
   @IgnoreJRERequirement // TODO: b/288085449 - Remove this once we use library-desugaring scents.
   public void testAutoIncrementStep_duration() {
     FakeTicker ticker = new FakeTicker().setAutoIncrementStep(Duration.ofMillis(1));

android/guava-tests/test/com/google/common/base/SuppliersTest.java

@@ -231,7 +231,6 @@ public void testMemoizeWithExpiration_longTimeUnit() throws InterruptedException
 
   @J2ktIncompatible
   @GwtIncompatible // Thread.sleep
-  @SuppressWarnings("Java7ApiChecker") // test of Java 8+ API
   public void testMemoizeWithExpiration_duration() throws InterruptedException {
     CountingSupplier countingSupplier = new CountingSupplier();
 
@@ -252,7 +251,6 @@ public void testMemoizeWithExpiration_longTimeUnitNegative() throws InterruptedE
         () -> Suppliers.memoizeWithExpiration(() -> "", -1, TimeUnit.MILLISECONDS));
   }
 
-  @SuppressWarnings("Java7ApiChecker") // test of Java 8+ API
   @J2ktIncompatible // Duration
   @GwtIncompatible // Duration
   public void testMemoizeWithExpiration_durationNegative() throws InterruptedException {
@@ -496,7 +494,6 @@ public void testSerialization() {
 
   @J2ktIncompatible
   @GwtIncompatible // reflection
-  @SuppressWarnings("Java7ApiChecker") // includes test of Java 8+ API
   public void testSuppliersNullChecks() throws Exception {
     new ClassSanityTester()
         .setDefault(Duration.class, Duration.ofSeconds(1))
@@ -507,7 +504,6 @@ public void testSuppliersNullChecks() throws Exception {
   @J2ktIncompatible
   @GwtIncompatible // reflection
   @AndroidIncompatible // TODO(cpovirk): ClassNotFoundException: com.google.common.base.Function
-  @SuppressWarnings("Java7ApiChecker") // includes test of Java 8+ API
   public void testSuppliersSerializable() throws Exception {
     new ClassSanityTester()
         .setDefault(Duration.class, Duration.ofSeconds(1))

android/guava-tests/test/com/google/common/cache/CacheBuilderTest.java

@@ -230,7 +230,6 @@ public void testValueStrengthSetTwice() {
   }
 
   @GwtIncompatible // Duration
-  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // No more dangerous than wherever the caller got the Duration from
   public void testLargeDurationsAreOk() {
     Duration threeHundredYears = Duration.ofDays(365 * 300);
@@ -251,7 +250,6 @@ public void testTimeToLive_negative() {
   }
 
   @GwtIncompatible // Duration
-  @SuppressWarnings("Java7ApiChecker")
   public void testTimeToLive_negative_duration() {
     CacheBuilder<Object, Object> builder = CacheBuilder.newBuilder();
     assertThrows(
@@ -276,7 +274,6 @@ public void testTimeToLive_setTwice() {
   }
 
   @GwtIncompatible // Duration
-  @SuppressWarnings("Java7ApiChecker")
   public void testTimeToLive_setTwice_duration() {
     CacheBuilder<Object, Object> builder =
         CacheBuilder.newBuilder().expireAfterWrite(Duration.ofHours(1));
@@ -293,7 +290,6 @@ public void testTimeToIdle_negative() {
   }
 
   @GwtIncompatible // Duration
-  @SuppressWarnings("Java7ApiChecker")
   public void testTimeToIdle_negative_duration() {
     CacheBuilder<Object, Object> builder = CacheBuilder.newBuilder();
     assertThrows(
@@ -318,14 +314,12 @@ public void testTimeToIdle_setTwice() {
   }
 
   @GwtIncompatible // Duration
-  @SuppressWarnings("Java7ApiChecker")
   public void testTimeToIdle_setTwice_duration() {
     CacheBuilder<Object, Object> builder =
         CacheBuilder.newBuilder().expireAfterAccess(Duration.ofHours(1));
     assertThrows(IllegalStateException.class, () -> builder.expireAfterAccess(Duration.ofHours(1)));
   }
 
-  @SuppressWarnings("Java7ApiChecker")
   public void testTimeToIdleAndToLive() {
     LoadingCache<?, ?> unused =
         CacheBuilder.newBuilder()
@@ -342,7 +336,6 @@ public void testRefresh_zero() {
   }
 
   @GwtIncompatible // Duration
-  @SuppressWarnings("Java7ApiChecker")
   public void testRefresh_zero_duration() {
     CacheBuilder<Object, Object> builder = CacheBuilder.newBuilder();
     assertThrows(IllegalArgumentException.class, () -> builder.refreshAfterWrite(Duration.ZERO));
@@ -356,7 +349,6 @@ public void testRefresh_setTwice() {
   }
 
   @GwtIncompatible // Duration
-  @SuppressWarnings("Java7ApiChecker")
   public void testRefresh_setTwice_duration() {
     CacheBuilder<Object, Object> builder =
         CacheBuilder.newBuilder().refreshAfterWrite(Duration.ofHours(1));

android/guava/src/com/google/common/collect/CollectCollectors.java

@@ -42,7 +42,7 @@
 /** Collectors utilities for {@code common.collect} internals. */
 @GwtCompatible
 @ElementTypesAreNonnullByDefault
-@SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+@SuppressWarnings("Java7ApiChecker")
 @IgnoreJRERequirement // used only from APIs with Java 8 types in them
 // (not used publicly by guava-android as of this writing, but we include it in the jar as a test)
 final class CollectCollectors {

android/guava/src/com/google/common/collect/Comparators.java

@@ -129,7 +129,7 @@ private Comparators() {}
    * @throws IllegalArgumentException if {@code k < 0}
    * @since 33.2.0 (available since 22.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object> Collector<T, ?, List<T>> least(
       int k, Comparator<? super T> comparator) {
@@ -163,7 +163,7 @@ private Comparators() {}
    * @throws IllegalArgumentException if {@code k < 0}
    * @since 33.2.0 (available since 22.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object> Collector<T, ?, List<T>> greatest(
       int k, Comparator<? super T> comparator) {

android/guava/src/com/google/common/collect/ImmutableBiMap.java

@@ -59,7 +59,7 @@ public abstract class ImmutableBiMap<K, V> extends ImmutableMap<K, V> implements
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K, V>
       Collector<T, ?, ImmutableBiMap<K, V>> toImmutableBiMap(
@@ -628,7 +628,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
    */
   @Deprecated
   @DoNotCall("Use toImmutableBiMap")
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K, V>
       Collector<T, ?, ImmutableMap<K, V>> toImmutableMap(
@@ -648,7 +648,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
    */
   @Deprecated
   @DoNotCall("Use toImmutableBiMap")
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K, V>
       Collector<T, ?, ImmutableMap<K, V>> toImmutableMap(

android/guava/src/com/google/common/collect/ImmutableCollection.java

@@ -178,7 +178,7 @@ public abstract class ImmutableCollection<E> extends AbstractCollection<E> imple
    * These are properties of the collection as a whole; SIZED and SUBSIZED are more properties of
    * the spliterator implementation.
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   // @IgnoreJRERequirement is not necessary because this compiles down to a constant.
   // (which is fortunate because Animal Sniffer doesn't look for @IgnoreJRERequirement on fields)
   static final int SPLITERATOR_CHARACTERISTICS =
@@ -191,7 +191,7 @@ public abstract class ImmutableCollection<E> extends AbstractCollection<E> imple
   public abstract UnmodifiableIterator<E> iterator();
 
   @Override
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // used only from APIs with Java 8 types in them
   // (not used within guava-android as of this writing, but we include it in the jar as a test)
   public Spliterator<E> spliterator() {

android/guava/src/com/google/common/collect/ImmutableList.java

@@ -69,7 +69,7 @@ public abstract class ImmutableList<E> extends ImmutableCollection<E>
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <E> Collector<E, ?, ImmutableList<E>> toImmutableList() {
     return CollectCollectors.toImmutableList();

android/guava/src/com/google/common/collect/ImmutableListMultimap.java

@@ -82,7 +82,7 @@ public class ImmutableListMultimap<K, V> extends ImmutableMultimap<K, V>
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K, V>
       Collector<T, ?, ImmutableListMultimap<K, V>> toImmutableListMultimap(
@@ -122,7 +122,7 @@ public class ImmutableListMultimap<K, V> extends ImmutableMultimap<K, V>
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K, V>
       Collector<T, ?, ImmutableListMultimap<K, V>> flatteningToImmutableListMultimap(

android/guava/src/com/google/common/collect/ImmutableMap.java

@@ -82,7 +82,7 @@ public abstract class ImmutableMap<K, V> implements Map<K, V>, Serializable {
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K, V>
       Collector<T, ?, ImmutableMap<K, V>> toImmutableMap(
@@ -104,7 +104,7 @@ public abstract class ImmutableMap<K, V> implements Map<K, V>, Serializable {
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K, V>
       Collector<T, ?, ImmutableMap<K, V>> toImmutableMap(

android/guava/src/com/google/common/collect/ImmutableMultiset.java

@@ -67,7 +67,7 @@ public abstract class ImmutableMultiset<E> extends ImmutableMultisetGwtSerializa
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <E> Collector<E, ?, ImmutableMultiset<E>> toImmutableMultiset() {
     return CollectCollectors.toImmutableMultiset(Function.identity(), e -> 1);
@@ -84,7 +84,7 @@ public abstract class ImmutableMultiset<E> extends ImmutableMultisetGwtSerializa
    *
    * @since 33.2.0 (available since 22.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, E>
       Collector<T, ?, ImmutableMultiset<E>> toImmutableMultiset(

android/guava/src/com/google/common/collect/ImmutableRangeMap.java

@@ -58,7 +58,7 @@ public class ImmutableRangeMap<K extends Comparable<?>, V> implements RangeMap<K
    *
    * @since 33.2.0 (available since 23.1 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K extends Comparable<? super K>, V>
       Collector<T, ?, ImmutableRangeMap<K, V>> toImmutableRangeMap(

android/guava/src/com/google/common/collect/ImmutableRangeSet.java

@@ -67,7 +67,7 @@ public final class ImmutableRangeSet<C extends Comparable> extends AbstractRange
    *
    * @since 33.2.0 (available since 23.1 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <E extends Comparable<? super E>>
       Collector<Range<E>, ?, ImmutableRangeSet<E>> toImmutableRangeSet() {

android/guava/src/com/google/common/collect/ImmutableSet.java

@@ -61,7 +61,7 @@ public abstract class ImmutableSet<E> extends ImmutableCollection<E> implements
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <E> Collector<E, ?, ImmutableSet<E>> toImmutableSet() {
     return CollectCollectors.toImmutableSet();

android/guava/src/com/google/common/collect/ImmutableSetMultimap.java

@@ -91,7 +91,7 @@ public class ImmutableSetMultimap<K, V> extends ImmutableMultimap<K, V>
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K, V>
       Collector<T, ?, ImmutableSetMultimap<K, V>> toImmutableSetMultimap(
@@ -140,7 +140,7 @@ public class ImmutableSetMultimap<K, V> extends ImmutableMultimap<K, V>
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K, V>
       Collector<T, ?, ImmutableSetMultimap<K, V>> flatteningToImmutableSetMultimap(

android/guava/src/com/google/common/collect/ImmutableSortedMap.java

@@ -76,7 +76,7 @@ public final class ImmutableSortedMap<K, V> extends ImmutableMap<K, V>
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K, V>
       Collector<T, ?, ImmutableSortedMap<K, V>> toImmutableSortedMap(
@@ -97,7 +97,7 @@ public final class ImmutableSortedMap<K, V> extends ImmutableMap<K, V>
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K, V>
       Collector<T, ?, ImmutableSortedMap<K, V>> toImmutableSortedMap(
@@ -1223,7 +1223,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
    */
   @DoNotCall("Use toImmutableSortedMap")
   @Deprecated
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K, V>
       Collector<T, ?, ImmutableMap<K, V>> toImmutableMap(
@@ -1243,7 +1243,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
    */
   @DoNotCall("Use toImmutableSortedMap")
   @Deprecated
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, K, V>
       Collector<T, ?, ImmutableMap<K, V>> toImmutableMap(

android/guava/src/com/google/common/collect/ImmutableSortedMultiset.java

@@ -70,7 +70,7 @@ public abstract class ImmutableSortedMultiset<E> extends ImmutableMultiset<E>
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <E> Collector<E, ?, ImmutableSortedMultiset<E>> toImmutableSortedMultiset(
       Comparator<? super E> comparator) {
@@ -88,7 +88,7 @@ public abstract class ImmutableSortedMultiset<E> extends ImmutableMultiset<E>
    *
    * @since 33.2.0 (available since 22.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, E>
       Collector<T, ?, ImmutableSortedMultiset<E>> toImmutableSortedMultiset(
@@ -108,7 +108,7 @@ public abstract class ImmutableSortedMultiset<E> extends ImmutableMultiset<E>
         (Multiset<E> multiset) -> copyOfSortedEntries(comparator, multiset.entrySet()));
   }
 
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // helper for toImmutableSortedMultiset
   /*
    * If we make these calls inline inside toImmutableSortedMultiset, we get an Animal Sniffer error,
@@ -761,7 +761,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
    */
   @DoNotCall("Use toImmutableSortedMultiset.")
   @Deprecated
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <E> Collector<E, ?, ImmutableMultiset<E>> toImmutableMultiset() {
     throw new UnsupportedOperationException();
@@ -778,7 +778,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
    */
   @DoNotCall("Use toImmutableSortedMultiset.")
   @Deprecated
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <T extends @Nullable Object, E>
       Collector<T, ?, ImmutableMultiset<E>> toImmutableMultiset(

android/guava/src/com/google/common/collect/ImmutableSortedSet.java

@@ -72,7 +72,7 @@ public abstract class ImmutableSortedSet<E> extends ImmutableSet<E>
    *
    * @since 33.2.0 (available since 21.0 in guava-jre)
    */
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <E> Collector<E, ?, ImmutableSortedSet<E>> toImmutableSortedSet(
       Comparator<? super E> comparator) {
@@ -803,7 +803,7 @@ Object writeReplace() {
    */
   @DoNotCall("Use toImmutableSortedSet")
   @Deprecated
-  @SuppressWarnings({"AndroidJdkLibsChecker", "Java7ApiChecker"})
+  @SuppressWarnings("Java7ApiChecker")
   @IgnoreJRERequirement // Users will use this only if they're already using streams.
   public static <E> Collector<E, ?, ImmutableSet<E>> toImmutableSet() {
     throw new UnsupportedOperationException();