Address some http://errorprone.info/bugpattern/PrivateConstructorForUtilityClass warnings.

RELNOTES=n/a
PiperOrigin-RevId: 793360913

Author: cpovirk

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

@@ -551,4 +551,12 @@ public static Method getMethod(Class<?> clazz, String name) {
       throw new IllegalArgumentException(e);
     }
   }
+
+  /**
+   * Useless constructor for a class of static utility methods.
+   *
+   * @deprecated Do not instantiate this utility class.
+   */
+  @Deprecated
+  public Helpers() {}
 }

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

@@ -65,4 +65,12 @@ protected BiMap<String, String> create(Entry<String, String>[] entries) {
       return ImmutableBiMap.copyOf(asList(entries));
     }
   }
+
+  /**
+   * Useless constructor for a class of static utility methods.
+   *
+   * @deprecated Do not instantiate this utility class.
+   */
+  @Deprecated
+  public BiMapGenerators() {}
 }

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

@@ -237,4 +237,12 @@ public Collection<Integer>[] createValueArray(int length) {
       return new ImmutableSet[length];
     }
   }
+
+  /**
+   * Useless constructor for a class of static utility methods.
+   *
+   * @deprecated Do not instantiate this utility class.
+   */
+  @Deprecated
+  public MapGenerators() {}
 }

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

@@ -426,4 +426,12 @@ final ContiguousSet<Integer> checkedCreate(SortedSet<Integer> elementsSet) {
       return ContiguousSet.create(range, DiscreteDomain.integers());
     }
   }
+
+  /**
+   * Useless constructor for a class of static utility methods.
+   *
+   * @deprecated Do not instantiate this utility class.
+   */
+  @Deprecated
+  public SetGenerators() {}
 }

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

@@ -132,4 +132,12 @@ protected List<String> create(String[] elements) {
       return builder.build().values().asList();
     }
   }
+
+  /**
+   * Useless constructor for a class of static utility methods.
+   *
+   * @deprecated Do not instantiate this utility class.
+   */
+  @Deprecated
+  public SortedMapGenerators() {}
 }

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

@@ -417,4 +417,12 @@ void assertMultimapIsUnmodifiable(Multimap<K, V> multimap, K sampleKey, V sample
       void assertMultimapRemainsUnmodified(Multimap<K, V> expected, List<Entry<K, V>> actual) {
     assertIteratorsInOrder(expected.entries().iterator(), actual.iterator());
   }
+
+  /**
+   * Useless constructor for a class of static utility methods.
+   *
+   * @deprecated Do not instantiate this utility class.
+   */
+  @Deprecated
+  public UnmodifiableCollectionTests() {}
 }

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

@@ -91,11 +91,13 @@ protected void tearDown() {
 
   static final Exception EXCEPTION = new Exception();
 
-  static class ExampleClassUnderTest {
+  static final class ExampleClassUnderTest {
     static final Logger logger = Logger.getLogger(ExampleClassUnderTest.class.getName());
 
     static void foo() {
       logger.log(Level.INFO, "message", EXCEPTION);
     }
+
+    private ExampleClassUnderTest() {}
   }
 }

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

@@ -23,7 +23,7 @@
  * @author Louis Wasserman
  */
 @NullUnmarked
-class BenchmarkHelpers {
+final class BenchmarkHelpers {
   private static final String WHITESPACE_CHARACTERS =
       "\u00a0\u180e\u202f\t\n\013\f\r \u0085"
           + "\u1680\u2028\u2029\u205f\u3000\u2000\u2001\u2002\u2003\u2004\u2005"
@@ -88,4 +88,6 @@ public enum SampleMatcherConfig {
       this.matchingChars = matchingChars;
     }
   }
+
+  private BenchmarkHelpers() {}
 }

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

@@ -55,7 +55,7 @@
  */
 @SuppressWarnings("GuardedBy") // TODO(b/35466881): Fix or suppress.
 @NullUnmarked
-class CacheTesting {
+final class CacheTesting {
 
   /**
    * Poke into the Cache internals to simulate garbage collection of the value associated with the
@@ -495,4 +495,6 @@ static void checkEmpty(Collection<?> collection) {
           .testEquals();
     }
   }
+
+  private CacheTesting() {}
 }

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

@@ -34,7 +34,7 @@
  */
 @GwtCompatible
 @NullUnmarked
-class TestingCacheLoaders {
+final class TestingCacheLoaders {
 
   /**
    * Returns a {@link CacheLoader} that implements a naive {@link CacheLoader#loadAll}, delegating
@@ -166,4 +166,6 @@ public T load(T key) {
       return key;
     }
   }
+
+  private TestingCacheLoaders() {}
 }