Internal change

RELNOTES=n/a
PiperOrigin-RevId: 347710478

README.md

@@ -125,4 +125,3 @@ flavor.
 
 [using Guava in your build]: https://github.com/google/guava/wiki/UseGuavaInYourBuild
 [repackage]: https://github.com/google/guava/wiki/UseGuavaInYourBuild#what-if-i-want-to-use-beta-apis-from-a-library-that-people-use-as-a-dependency
-

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

@@ -29,7 +29,6 @@
  * serialization tests require more setup. This no-op behavior allows test authors to intersperse
  * {@code SerializableTester} calls with other, GWT-compatible tests.
  *
- *
  * @author Mike Bostock
  * @since 10.0
  */

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

@@ -151,7 +151,7 @@ private void runConcurrentTest(int numberOfThreads, final Callable<Void> callabl
     final CountDownLatch startLatch = new CountDownLatch(numberOfThreads);
     final CountDownLatch doneLatch = new CountDownLatch(numberOfThreads);
     for (int i = numberOfThreads; i > 0; i--) {
-      @SuppressWarnings("unused") // go/futurereturn-lsc
+      @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
       Future<?> possiblyIgnoredError =
           executorService.submit(
               new Callable<Void>() {

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

@@ -16,6 +16,7 @@
 
 package com.google.common.testing;
 
+
 /** Test nulls for the entire package. */
 
 public class PackageSanityTests extends AbstractPackageSanityTests {}

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

@@ -29,7 +29,6 @@
 /**
  * Benchmark for the {@link CharMatcher} class.
  *
- *
  * @author David Beaumont
  * @author Kevin Bourrillion
  * @author David Richter

android/guava-tests/benchmark/com/google/common/util/concurrent/ExecutionListBenchmark.java

@@ -252,7 +252,7 @@ void setUp() throws Exception {
     final AtomicInteger integer = new AtomicInteger();
     // Execute a bunch of tasks to ensure that our threads are allocated and hot
     for (int i = 0; i < NUM_THREADS * 10; i++) {
-      @SuppressWarnings("unused") // go/futurereturn-lsc
+      @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
       Future<?> possiblyIgnoredError =
           executorService.submit(
               new Runnable() {
@@ -334,10 +334,10 @@ public void run() {
       list = impl.newExecutionList();
       listenerLatch = new CountDownLatch(numListeners * NUM_THREADS);
       for (int j = 0; j < NUM_THREADS; j++) {
-        @SuppressWarnings("unused") // go/futurereturn-lsc
+        @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
         Future<?> possiblyIgnoredError = executorService.submit(addTask);
       }
-      @SuppressWarnings("unused") // go/futurereturn-lsc
+      @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
       Future<?> possiblyIgnoredError = executorService.submit(executeTask);
       returnValue += (int) listenerLatch.getCount();
       listenerLatch.await();
@@ -360,10 +360,10 @@ public void run() {
     for (int i = 0; i < reps; i++) {
       list = impl.newExecutionList();
       listenerLatch = new CountDownLatch(numListeners * NUM_THREADS);
-      @SuppressWarnings("unused") // go/futurereturn-lsc
+      @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
       Future<?> possiblyIgnoredError = executorService.submit(executeTask);
       for (int j = 0; j < NUM_THREADS; j++) {
-        @SuppressWarnings("unused") // go/futurereturn-lsc
+        @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
         Future<?> possiblyIgnoredError1 = executorService.submit(addTask);
       }
       returnValue += (int) listenerLatch.getCount();

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

@@ -171,6 +171,7 @@ public Integer computeNext() {
     }
   }
 
+
   @GwtIncompatible // weak references
   public void testFreesNextReference() {
     Iterator<Object> itr =

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

@@ -32,7 +32,6 @@
  * Google-internal Android suite generators. Note that those generators also suppress any test
  * annotated with MediumTest or LargeTest.
  *
- *
  * <p>Why use a custom annotation instead of {@code android.test.suitebuilder.annotation.Suppress}?
  * I'm not completely sure that this is the right choice, but it has various advantages:
  *

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

@@ -79,6 +79,7 @@ public void testGetIfPresent_whenNoMatchingConstant() {
     assertThat(Enums.getIfPresent(TestEnum.class, "WOMBAT")).isAbsent();
   }
 
+
   @GwtIncompatible // weak references
   public void testGetIfPresent_doesNotPreventClassUnloading() throws Exception {
     WeakReference<?> shadowLoaderReference = doTestClassUnloading();

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

@@ -47,6 +47,7 @@
  * @author Eamonn McManus
  */
 
+
 public class FinalizableReferenceQueueClassLoaderUnloadingTest extends TestCase {
 
   /*

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

@@ -40,6 +40,7 @@ protected void tearDown() throws Exception {
     frq = null;
   }
 
+
   public void testFinalizeReferentCalled() {
     final MockReference reference = new MockReference(frq = new FinalizableReferenceQueue());
 
@@ -71,6 +72,7 @@ public void finalizeReferent() {
    */
   private WeakReference<ReferenceQueue<Object>> queueReference;
 
+
   public void testThatFinalizerStops() {
     weaklyReferenceQueue();
     GcFinalization.awaitClear(queueReference);

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

@@ -500,7 +500,7 @@ public void testRemovalNotification_clear_basher() throws InterruptedException {
     final CountDownLatch tasksFinished = new CountDownLatch(nTasks);
     for (int i = 0; i < nTasks; i++) {
       final String s = "a" + i;
-      @SuppressWarnings("unused") // go/futurereturn-lsc
+      @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
       Future<?> possiblyIgnoredError =
           threadPool.submit(
               new Runnable() {
@@ -595,7 +595,7 @@ public String load(String key) throws InterruptedException {
 
     ExecutorService threadPool = Executors.newFixedThreadPool(nThreads);
     for (int i = 0; i < nTasks; i++) {
-      @SuppressWarnings("unused") // go/futurereturn-lsc
+      @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
       Future<?> possiblyIgnoredError =
           threadPool.submit(
               new Runnable() {

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

@@ -79,7 +79,7 @@ public Map<Object, Object> loadAll(Iterable<?> keys) {
     assertEquals(0, loadAllCount.get());
 
     baseLoader.load(new Object());
-    @SuppressWarnings("unused") // go/futurereturn-lsc
+    @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
     Future<?> possiblyIgnoredError = baseLoader.reload(new Object(), new Object());
     baseLoader.loadAll(ImmutableList.of(new Object()));
     assertEquals(1, loadCount.get());
@@ -90,7 +90,7 @@ public Map<Object, Object> loadAll(Iterable<?> keys) {
     CacheLoader<Object, Object> asyncReloader = CacheLoader.asyncReloading(baseLoader, executor);
 
     asyncReloader.load(new Object());
-    @SuppressWarnings("unused") // go/futurereturn-lsc
+    @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
     Future<?> possiblyIgnoredError1 = asyncReloader.reload(new Object(), new Object());
     asyncReloader.loadAll(ImmutableList.of(new Object()));
     assertEquals(2, loadCount.get());

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

@@ -1766,6 +1766,7 @@ public String load(Integer key) throws Exception {
     assertEquals(0, removalListener.getCount());
   }
 
+
   public void testReloadAfterValueReclamation() throws InterruptedException, ExecutionException {
     CountingLoader countingLoader = new CountingLoader();
     LoadingCache<Object, Object> cache =
@@ -1940,6 +1941,7 @@ public void testBulkLoadingExceptionWithCause() {
     }
   }
 
+
   public void testConcurrentLoading() throws InterruptedException {
     testConcurrentLoading(CacheBuilder.newBuilder());
   }
@@ -1952,6 +1954,7 @@ private static void testConcurrentLoading(CacheBuilder<Object, Object> builder)
     testConcurrentLoadingCheckedException(builder);
   }
 
+
   public void testConcurrentExpirationLoading() throws InterruptedException {
     testConcurrentLoading(CacheBuilder.newBuilder().expireAfterWrite(10, TimeUnit.SECONDS));
   }
@@ -2181,6 +2184,7 @@ public void run() {
     return resultList;
   }
 
+
   public void testAsMapDuringLoading() throws InterruptedException, ExecutionException {
     final CountDownLatch getStartedSignal = new CountDownLatch(2);
     final CountDownLatch letGetFinishSignal = new CountDownLatch(1);
@@ -2239,6 +2243,7 @@ public void run() {
     assertEquals(refreshKey + suffix, map.get(refreshKey));
   }
 
+
   public void testInvalidateDuringLoading() throws InterruptedException, ExecutionException {
     // computation starts; invalidate() is called on the key being computed, computation finishes
     final CountDownLatch computationStarted = new CountDownLatch(2);
@@ -2295,6 +2300,7 @@ public void run() {
     assertEquals(2, cache.size());
   }
 
+
   public void testInvalidateAndReloadDuringLoading()
       throws InterruptedException, ExecutionException {
     // computation starts; clear() is called, computation finishes
@@ -2367,6 +2373,7 @@ public void run() {
     assertEquals(refreshKey + suffix, map.get(refreshKey));
   }
 
+
   public void testExpandDuringLoading() throws InterruptedException {
     final int count = 3;
     final AtomicInteger callCount = new AtomicInteger();

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

@@ -47,6 +47,7 @@ public void testEmpty() {
     }
   }
 
+
   public void testInvalidate_empty() {
     for (LoadingCache<Object, Object> cache : caches()) {
       cache.getUnchecked("a");
@@ -68,6 +69,7 @@ public void testInvalidateAll_empty() {
     }
   }
 
+
   public void testEquals_null() {
     for (LoadingCache<Object, Object> cache : caches()) {
       assertFalse(cache.equals(null));
@@ -137,6 +139,7 @@ public void testKeySet_addNotSupported() {
     }
   }
 
+
   public void testKeySet_clear() {
     for (LoadingCache<Object, Object> cache : caches()) {
       warmUp(cache, 0, 100);
@@ -211,6 +214,7 @@ public void testValues_addNotSupported() {
     }
   }
 
+
   public void testValues_clear() {
     for (LoadingCache<Object, Object> cache : caches()) {
       warmUp(cache, 0, 100);
@@ -285,6 +289,7 @@ public void testEntrySet_addNotSupported() {
     }
   }
 
+
   public void testEntrySet_clear() {
     for (LoadingCache<Object, Object> cache : caches()) {
       warmUp(cache, 0, 100);

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

@@ -97,6 +97,7 @@ protected Map<String, String> create(Entry<String, String>[] entries) {
     }
   }
 
+
   public static Test suite() {
     TestSuite suite = new TestSuite();
     suite.addTestSuite(LocalCacheTest.class);
@@ -700,6 +701,7 @@ public void testValues() {
     assertEquals(1, map.size());
   }
 
+
   public void testCopyEntry_computing() {
     final CountDownLatch startSignal = new CountDownLatch(1);
     final CountDownLatch computingSignal = new CountDownLatch(1);
@@ -801,6 +803,7 @@ public void onRemoval(RemovalNotification<Object, Object> notification) {
     checkLogged(e);
   }
 
+
   public void testRemovalListener_replaced_computing() {
     final CountDownLatch startSignal = new CountDownLatch(1);
     final CountDownLatch computingSignal = new CountDownLatch(1);

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

@@ -157,7 +157,7 @@ public void testStatsNoops() {
     assertThat(map).containsEntry(three, one);
     assertThat(map).containsEntry(one, two);
 
-    // TODO(cgruber): Confirm with fry@ that this is a reasonable substitute.
+    // TODO(user): Confirm with fry@ that this is a reasonable substitute.
     // Set<Entry<Object, Object>> entries = map.entrySet();
     // assertThat(entries).containsExactly(
     //    Maps.immutableEntry(three, one), Maps.immutableEntry(one, two));
@@ -293,6 +293,7 @@ public void testAsMapRecency() {
     assertFalse(segment.recencyQueue.isEmpty());
   }
 
+
   public void testRecursiveComputation() throws InterruptedException {
     final AtomicReference<LoadingCache<Integer, String>> cacheRef = new AtomicReference<>();
     CacheLoader<Integer, String> recursiveLoader =

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

@@ -187,6 +187,7 @@ public void testRemove_byKeyAndValue() {
     }
   }
 
+
   public void testKeySet_populated() {
     for (LoadingCache<Object, Object> cache : caches()) {
       Set<Object> keys = cache.asMap().keySet();
@@ -237,6 +238,7 @@ public void testValues_populated() {
     }
   }
 
+
   public void testEntrySet_populated() {
     for (LoadingCache<Object, Object> cache : caches()) {
       Set<Entry<Object, Object>> entries = cache.asMap().entrySet();

android/guava-tests/test/com/google/common/collect/AbstractIteratorTest.java

@@ -137,6 +137,7 @@ public Integer computeNext() {
     }
   }
 
+
   @GwtIncompatible // weak references
   public void testFreesNextReference() {
     Iterator<Object> itr =

android/guava-tests/test/com/google/common/collect/ImmutableRangeMapTest.java

@@ -208,6 +208,7 @@ public void testAsMapOfRanges() {
     }
   }
 
+
   public void testSubRangeMap() {
     for (Range<Integer> range1 : RANGES) {
       for (Range<Integer> range2 : RANGES) {

android/guava-tests/test/com/google/common/collect/InternersTest.java

@@ -84,6 +84,7 @@ public void testWeak_builder() {
     assertEquals(concurrencyLevel, internerImpl.map.concurrencyLevel);
   }
 
+
   public void testWeak_afterGC() throws InterruptedException {
     Integer canonical = new Integer(5);
     Integer not = new Integer(5);

android/guava-tests/test/com/google/common/collect/QueuesTest.java

@@ -101,15 +101,15 @@ public void testMultipleProducers() throws Exception {
 
   private void testMultipleProducers(BlockingQueue<Object> q) throws InterruptedException {
     for (boolean interruptibly : new boolean[] {true, false}) {
-      @SuppressWarnings("unused") // go/futurereturn-lsc
+      @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
       Future<?> possiblyIgnoredError = threadPool.submit(new Producer(q, 20));
-      @SuppressWarnings("unused") // go/futurereturn-lsc
+      @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
       Future<?> possiblyIgnoredError1 = threadPool.submit(new Producer(q, 20));
-      @SuppressWarnings("unused") // go/futurereturn-lsc
+      @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
       Future<?> possiblyIgnoredError2 = threadPool.submit(new Producer(q, 20));
-      @SuppressWarnings("unused") // go/futurereturn-lsc
+      @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
       Future<?> possiblyIgnoredError3 = threadPool.submit(new Producer(q, 20));
-      @SuppressWarnings("unused") // go/futurereturn-lsc
+      @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
       Future<?> possiblyIgnoredError4 = threadPool.submit(new Producer(q, 20));
 
       List<Object> buf = newArrayList();
@@ -182,7 +182,7 @@ public void testNegativeMaxElements() throws Exception {
   }
 
   private void testNegativeMaxElements(BlockingQueue<Object> q) throws InterruptedException {
-    @SuppressWarnings("unused") // go/futurereturn-lsc
+    @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
     Future<?> possiblyIgnoredError = threadPool.submit(new Producer(q, 1));
 
     List<Object> buf = newArrayList();
@@ -201,7 +201,7 @@ public void testDrain_throws() throws Exception {
   }
 
   private void testDrain_throws(BlockingQueue<Object> q) {
-    @SuppressWarnings("unused") // go/futurereturn-lsc
+    @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
     Future<?> possiblyIgnoredError = threadPool.submit(new Interrupter(currentThread()));
     try {
       Queues.drain(q, ImmutableList.of(), 100, MAX_VALUE, NANOSECONDS);
@@ -218,7 +218,7 @@ public void testDrainUninterruptibly_doesNotThrow() throws Exception {
 
   private void testDrainUninterruptibly_doesNotThrow(final BlockingQueue<Object> q) {
     final Thread mainThread = currentThread();
-    @SuppressWarnings("unused") // go/futurereturn-lsc
+    @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
     Future<?> possiblyIgnoredError =
         threadPool.submit(
             new Callable<Void>() {
@@ -275,7 +275,7 @@ private void assertInterruptibleDrained(BlockingQueue<Object> q) {
     }
 
     // but does the wait actually occurs?
-    @SuppressWarnings("unused") // go/futurereturn-lsc
+    @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
     Future<?> possiblyIgnoredError = threadPool.submit(new Interrupter(currentThread()));
     try {
       // if waiting works, this should get stuck
@@ -291,7 +291,7 @@ private void assertUninterruptibleDrained(BlockingQueue<Object> q) {
     assertEquals(0, Queues.drainUninterruptibly(q, ImmutableList.of(), 0, 10, MILLISECONDS));
 
     // but does the wait actually occurs?
-    @SuppressWarnings("unused") // go/futurereturn-lsc
+    @SuppressWarnings("unused") // https://errorprone.info/bugpattern/FutureReturnValueIgnored
     Future<?> possiblyIgnoredError = threadPool.submit(new Interrupter(currentThread()));
 
     Stopwatch timer = Stopwatch.createStarted();