Apply private to some classes that are nested directly inside a top-level class.

(We could apply it to some more deeply nested classes, too, but I don't want to go out of my way to do so: `private` would be redundant for any classes that are "effectively private.")

Plus, address a few Error Prone warnings in the backport-only `ObjectCountHashMap`. Notably, delete `ObjectCountHashMap.MapEntry.setCount`, which was introduced in cl/181210213 but never used (because we always use `ObjectCountHashMap.setValue`, I think).

RELNOTES=n/a
PiperOrigin-RevId: 792628431

Author: cpovirk

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

@@ -64,7 +64,7 @@ protected List<TestSuite> createDerivedSuites(
     return derivedSuites;
   }
 
-  static class ReserializedCollectionGenerator<E> implements TestCollectionGenerator<E> {
+  private static class ReserializedCollectionGenerator<E> implements TestCollectionGenerator<E> {
     final OneSizeTestContainerGenerator<Collection<E>, E> gen;
 
     private ReserializedCollectionGenerator(OneSizeTestContainerGenerator<Collection<E>, E> gen) {

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

@@ -121,7 +121,7 @@ protected List<TestSuite> createDerivedSuites(
     return derivedSuites;
   }
 
-  static class ReserializedListGenerator<E> implements TestListGenerator<E> {
+  private static class ReserializedListGenerator<E> implements TestListGenerator<E> {
     final OneSizeTestContainerGenerator<Collection<E>, E> gen;
 
     private ReserializedListGenerator(OneSizeTestContainerGenerator<Collection<E>, E> gen) {

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

@@ -139,7 +139,7 @@ NavigableMapTestSuiteBuilder<K, V> subSuiteUsing(TestSortedMapGenerator<K, V> ge
     return using(generator);
   }
 
-  static class DescendingTestMapGenerator<K, V> extends ForwardingTestMapGenerator<K, V>
+  private static class DescendingTestMapGenerator<K, V> extends ForwardingTestMapGenerator<K, V>
       implements TestSortedMapGenerator<K, V> {
     DescendingTestMapGenerator(TestSortedMapGenerator<K, V> delegate) {
       super(delegate);

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

@@ -87,7 +87,7 @@ protected List<TestSuite> createDerivedSuites(
     return derivedSuites;
   }
 
-  static class ReserializedSetGenerator<E> implements TestSetGenerator<E> {
+  private static class ReserializedSetGenerator<E> implements TestSetGenerator<E> {
     final OneSizeTestContainerGenerator<Collection<E>, E> gen;
 
     private ReserializedSetGenerator(OneSizeTestContainerGenerator<Collection<E>, E> gen) {

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

@@ -435,7 +435,7 @@ public Iterable<Entry<K, V>> order(List<Entry<K, V>> insertionOrder) {
     }
   }
 
-  static class ValuesGenerator<K, V, M extends Multimap<K, V>>
+  private static class ValuesGenerator<K, V, M extends Multimap<K, V>>
       implements TestCollectionGenerator<V> {
     private final OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator;
 
@@ -489,7 +489,7 @@ public Iterable<V> order(List<V> insertionOrder) {
     }
   }
 
-  static class KeysGenerator<K, V, M extends Multimap<K, V>>
+  private static class KeysGenerator<K, V, M extends Multimap<K, V>>
       implements TestMultisetGenerator<K>, DerivedGenerator {
     private final OneSizeTestContainerGenerator<M, Entry<K, V>> multimapGenerator;
 

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

@@ -196,7 +196,7 @@ public Iterable<E> order(List<E> insertionOrder) {
     }
   }
 
-  static class EntrySetGenerator<E> implements TestSetGenerator<Multiset.Entry<E>> {
+  private static class EntrySetGenerator<E> implements TestSetGenerator<Multiset.Entry<E>> {
     final OneSizeTestContainerGenerator<Collection<E>, E> gen;
 
     private EntrySetGenerator(OneSizeTestContainerGenerator<Collection<E>, E> gen) {
@@ -255,7 +255,7 @@ public Iterable<Entry<E>> order(List<Entry<E>> insertionOrder) {
     }
   }
 
-  static class ReserializedMultisetGenerator<E> implements TestMultisetGenerator<E> {
+  private static class ReserializedMultisetGenerator<E> implements TestMultisetGenerator<E> {
     final OneSizeTestContainerGenerator<Collection<E>, E> gen;
 
     private ReserializedMultisetGenerator(OneSizeTestContainerGenerator<Collection<E>, E> gen) {

android/guava/src/com/google/common/base/FinalizableReferenceQueue.java

@@ -377,7 +377,7 @@ URLClassLoader newLoader(URL base) {
    * Loads Finalizer directly using the current class loader. We won't be able to garbage collect
    * this class loader, but at least the world doesn't end.
    */
-  static class DirectLoader implements FinalizerLoader {
+  private static class DirectLoader implements FinalizerLoader {
     @Override
     public Class<?> loadFinalizer() {
       try {

android/guava/src/com/google/common/base/Suppliers.java

@@ -171,8 +171,8 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
     @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0;
   }
 
-  @VisibleForTesting
-  static class NonSerializableMemoizingSupplier<T extends @Nullable Object> implements Supplier<T> {
+  private static class NonSerializableMemoizingSupplier<T extends @Nullable Object>
+      implements Supplier<T> {
     private final Object lock = new Object();
 
     @SuppressWarnings("UnnecessaryLambda") // Must be a fixed singleton object

android/guava/src/com/google/common/cache/CacheBuilderSpec.java

@@ -325,7 +325,7 @@ public void parse(CacheBuilderSpec spec, String key, @Nullable String value) {
   }
 
   /** Parse initialCapacity */
-  static class InitialCapacityParser extends IntegerParser {
+  private static class InitialCapacityParser extends IntegerParser {
     @Override
     protected void parseInteger(CacheBuilderSpec spec, int value) {
       checkArgument(
@@ -337,7 +337,7 @@ protected void parseInteger(CacheBuilderSpec spec, int value) {
   }
 
   /** Parse maximumSize */
-  static class MaximumSizeParser extends LongParser {
+  private static class MaximumSizeParser extends LongParser {
     @Override
     protected void parseLong(CacheBuilderSpec spec, long value) {
       checkArgument(
@@ -349,7 +349,7 @@ protected void parseLong(CacheBuilderSpec spec, long value) {
   }
 
   /** Parse maximumWeight */
-  static class MaximumWeightParser extends LongParser {
+  private static class MaximumWeightParser extends LongParser {
     @Override
     protected void parseLong(CacheBuilderSpec spec, long value) {
       checkArgument(
@@ -361,7 +361,7 @@ protected void parseLong(CacheBuilderSpec spec, long value) {
   }
 
   /** Parse concurrencyLevel */
-  static class ConcurrencyLevelParser extends IntegerParser {
+  private static class ConcurrencyLevelParser extends IntegerParser {
     @Override
     protected void parseInteger(CacheBuilderSpec spec, int value) {
       checkArgument(
@@ -373,7 +373,7 @@ protected void parseInteger(CacheBuilderSpec spec, int value) {
   }
 
   /** Parse weakKeys */
-  static class KeyStrengthParser implements ValueParser {
+  private static class KeyStrengthParser implements ValueParser {
     private final Strength strength;
 
     public KeyStrengthParser(Strength strength) {
@@ -389,7 +389,7 @@ public void parse(CacheBuilderSpec spec, String key, @Nullable String value) {
   }
 
   /** Parse weakValues and softValues */
-  static class ValueStrengthParser implements ValueParser {
+  private static class ValueStrengthParser implements ValueParser {
     private final Strength strength;
 
     public ValueStrengthParser(Strength strength) {
@@ -407,7 +407,7 @@ public void parse(CacheBuilderSpec spec, String key, @Nullable String value) {
   }
 
   /** Parse recordStats */
-  static class RecordStatsParser implements ValueParser {
+  private static class RecordStatsParser implements ValueParser {
 
     @Override
     public void parse(CacheBuilderSpec spec, String key, @Nullable String value) {
@@ -457,7 +457,7 @@ public void parse(CacheBuilderSpec spec, String key, @Nullable String value) {
   }
 
   /** Parse expireAfterAccess */
-  static class AccessDurationParser extends DurationParser {
+  private static class AccessDurationParser extends DurationParser {
     @Override
     protected void parseDuration(CacheBuilderSpec spec, long duration, TimeUnit unit) {
       checkArgument(spec.accessExpirationTimeUnit == null, "expireAfterAccess already set");
@@ -467,7 +467,7 @@ protected void parseDuration(CacheBuilderSpec spec, long duration, TimeUnit unit
   }
 
   /** Parse expireAfterWrite */
-  static class WriteDurationParser extends DurationParser {
+  private static class WriteDurationParser extends DurationParser {
     @Override
     protected void parseDuration(CacheBuilderSpec spec, long duration, TimeUnit unit) {
       checkArgument(spec.writeExpirationTimeUnit == null, "expireAfterWrite already set");
@@ -477,7 +477,7 @@ protected void parseDuration(CacheBuilderSpec spec, long duration, TimeUnit unit
   }
 
   /** Parse refreshAfterWrite */
-  static class RefreshDurationParser extends DurationParser {
+  private static class RefreshDurationParser extends DurationParser {
     @Override
     protected void parseDuration(CacheBuilderSpec spec, long duration, TimeUnit unit) {
       checkArgument(spec.refreshTimeUnit == null, "refreshAfterWrite already set");

android/guava/src/com/google/common/cache/LocalCache.java

@@ -962,7 +962,7 @@ static <E> Queue<E> discardingQueue() {
    */
 
   /** Used for strongly-referenced keys. */
-  static class StrongEntry<K, V> extends AbstractReferenceEntry<K, V> {
+  private static class StrongEntry<K, V> extends AbstractReferenceEntry<K, V> {
     final K key;
 
     StrongEntry(K key, int hash, @Nullable ReferenceEntry<K, V> next) {
@@ -1182,7 +1182,7 @@ public void setPreviousInWriteQueue(ReferenceEntry<K, V> previous) {
   }
 
   /** Used for weakly-referenced keys. */
-  static class WeakEntry<K, V> extends WeakReference<K> implements ReferenceEntry<K, V> {
+  private static class WeakEntry<K, V> extends WeakReference<K> implements ReferenceEntry<K, V> {
     WeakEntry(ReferenceQueue<K> queue, K key, int hash, @Nullable ReferenceEntry<K, V> next) {
       super(key, queue);
       this.hash = hash;
@@ -1470,7 +1470,8 @@ public void setPreviousInWriteQueue(ReferenceEntry<K, V> previous) {
   }
 
   /** References a weak value. */
-  static class WeakValueReference<K, V> extends WeakReference<V> implements ValueReference<K, V> {
+  private static class WeakValueReference<K, V> extends WeakReference<V>
+      implements ValueReference<K, V> {
     final ReferenceEntry<K, V> entry;
 
     WeakValueReference(ReferenceQueue<V> queue, V referent, ReferenceEntry<K, V> entry) {
@@ -1514,7 +1515,8 @@ public V waitForValue() {
   }
 
   /** References a soft value. */
-  static class SoftValueReference<K, V> extends SoftReference<V> implements ValueReference<K, V> {
+  private static class SoftValueReference<K, V> extends SoftReference<V>
+      implements ValueReference<K, V> {
     final ReferenceEntry<K, V> entry;
 
     SoftValueReference(ReferenceQueue<V> queue, V referent, ReferenceEntry<K, V> entry) {
@@ -1558,7 +1560,7 @@ public V waitForValue() {
   }
 
   /** References a strong value. */
-  static class StrongValueReference<K, V> implements ValueReference<K, V> {
+  private static class StrongValueReference<K, V> implements ValueReference<K, V> {
     final V referent;
 
     StrongValueReference(V referent) {
@@ -4491,7 +4493,7 @@ public boolean remove(Object o) {
    * <p>Unfortunately, readResolve() doesn't get called when a circular dependency is present, so
    * the proxy must be able to behave as the cache itself.
    */
-  static class ManualSerializationProxy<K, V> extends ForwardingCache<K, V>
+  private static class ManualSerializationProxy<K, V> extends ForwardingCache<K, V>
       implements Serializable {
     @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1;