Make nested package-private classes final.

RELNOTES=n/a
PiperOrigin-RevId: 792829911

Author: cpovirk

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

@@ -64,7 +64,8 @@ protected List<TestSuite> createDerivedSuites(
     return derivedSuites;
   }
 
-  private static class ReserializedCollectionGenerator<E> implements TestCollectionGenerator<E> {
+  private static final 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;
   }
 
-  private static class ReserializedListGenerator<E> implements TestListGenerator<E> {
+  private static final 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,8 +139,8 @@ NavigableMapTestSuiteBuilder<K, V> subSuiteUsing(TestSortedMapGenerator<K, V> ge
     return using(generator);
   }
 
-  private static class DescendingTestMapGenerator<K, V> extends ForwardingTestMapGenerator<K, V>
-      implements TestSortedMapGenerator<K, V> {
+  private static final 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;
   }
 
-  private static class ReserializedSetGenerator<E> implements TestSetGenerator<E> {
+  private static final 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) {
     }
   }
 
-  private static class ValuesGenerator<K, V, M extends Multimap<K, V>>
+  private static final 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) {
     }
   }
 
-  private static class KeysGenerator<K, V, M extends Multimap<K, V>>
+  private static final 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

@@ -163,7 +163,7 @@ TestSuite createElementSetTestSuite(
         .createTestSuite();
   }
 
-  static class ElementSetGenerator<E> implements TestSetGenerator<E> {
+  static final class ElementSetGenerator<E> implements TestSetGenerator<E> {
     final OneSizeTestContainerGenerator<Collection<E>, E> gen;
 
     ElementSetGenerator(OneSizeTestContainerGenerator<Collection<E>, E> gen) {
@@ -196,7 +196,7 @@ public Iterable<E> order(List<E> insertionOrder) {
     }
   }
 
-  private static class EntrySetGenerator<E> implements TestSetGenerator<Multiset.Entry<E>> {
+  private static final 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) {
     }
   }
 
-  private static class ReserializedMultisetGenerator<E> implements TestMultisetGenerator<E> {
+  private static final class ReserializedMultisetGenerator<E> implements TestMultisetGenerator<E> {
     final OneSizeTestContainerGenerator<Collection<E>, E> gen;
 
     private ReserializedMultisetGenerator(OneSizeTestContainerGenerator<Collection<E>, E> gen) {

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

@@ -122,7 +122,7 @@ public Set<Entry<K, V>> create(Object... elements) {
     }
   }
 
-  static class MultimapGetGenerator<K, V>
+  static final class MultimapGetGenerator<K, V>
       extends MultimapTestSuiteBuilder.MultimapGetGenerator<K, V, SetMultimap<K, V>>
       implements TestSetGenerator<V> {
     public MultimapGetGenerator(
@@ -136,7 +136,7 @@ public Set<V> create(Object... elements) {
     }
   }
 
-  static class MultimapAsMapGetGenerator<K, V>
+  static final class MultimapAsMapGetGenerator<K, V>
       extends MultimapTestSuiteBuilder.MultimapAsMapGetGenerator<K, V, SetMultimap<K, V>>
       implements TestSetGenerator<V> {
     public MultimapAsMapGetGenerator(

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

@@ -21,17 +21,17 @@
 /** Exception classes for use in tests. */
 @GwtCompatible
 final class TestExceptions {
-  static class SomeError extends Error {}
+  static final class SomeError extends Error {}
 
-  static class SomeCheckedException extends Exception {}
+  static final class SomeCheckedException extends Exception {}
 
-  static class SomeOtherCheckedException extends Exception {}
+  static final class SomeOtherCheckedException extends Exception {}
 
-  static class YetAnotherCheckedException extends Exception {}
+  static final class YetAnotherCheckedException extends Exception {}
 
-  static class SomeUncheckedException extends RuntimeException {}
+  static final class SomeUncheckedException extends RuntimeException {}
 
-  static class SomeChainingException extends RuntimeException {
+  static final class SomeChainingException extends RuntimeException {
     public SomeChainingException(Throwable cause) {
       super(cause);
     }

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

@@ -36,8 +36,6 @@
 import com.google.common.reflect.Reflection;
 import com.google.common.reflect.TypeToken;
 import com.google.common.testing.NullPointerTester.Visibility;
-import com.google.common.testing.RelationshipTester.Item;
-import com.google.common.testing.RelationshipTester.ItemReporter;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
@@ -592,15 +590,12 @@ private void testEqualsUsing(Invokable<?, ?> factory)
     argGroups.add(ImmutableList.of(args, equalArgs));
     EqualsTester tester =
         new EqualsTester(
-            new ItemReporter() {
-              @Override
-              String reportItem(Item<?> item) {
-                List<Object> factoryArgs = argGroups.get(item.groupNumber).get(item.itemNumber);
-                return factory.getName()
-                    + "("
-                    + Joiner.on(", ").useForNull("null").join(factoryArgs)
-                    + ")";
-              }
+            /* itemReporter= */ item -> {
+              List<Object> factoryArgs = argGroups.get(item.groupNumber).get(item.itemNumber);
+              return factory.getName()
+                  + "("
+                  + Joiner.on(", ").useForNull("null").join(factoryArgs)
+                  + ")";
             });
     tester.addEqualityGroup(instance, createInstance(factory, equalArgs));
     for (int i = 0; i < params.size(); i++) {
@@ -788,7 +783,7 @@ private static <T> T createInstance(Invokable<?, ? extends T> factory, List<?> a
    * the dummy value of a constructor or method parameter is unknown.
    */
   @VisibleForTesting
-  static class ParameterNotInstantiableException extends Exception {
+  static final class ParameterNotInstantiableException extends Exception {
     public ParameterNotInstantiableException(Parameter parameter) {
       super(
           "Cannot determine value for parameter "
@@ -804,7 +799,7 @@ public ParameterNotInstantiableException(Parameter parameter) {
    * class.
    */
   @VisibleForTesting
-  static class ParameterHasNoDistinctValueException extends Exception {
+  static final class ParameterHasNoDistinctValueException extends Exception {
     ParameterHasNoDistinctValueException(Parameter parameter) {
       super(
           "Cannot generate distinct value for parameter "
@@ -819,7 +814,7 @@ static class ParameterHasNoDistinctValueException extends Exception {
    * factory returned null.
    */
   @VisibleForTesting
-  static class FactoryMethodReturnsNullException extends Exception {
+  static final class FactoryMethodReturnsNullException extends Exception {
     public FactoryMethodReturnsNullException(Invokable<?, ?> factory) {
       super(factory + " returns null and cannot be used to test instance methods.");
     }

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

@@ -23,6 +23,7 @@
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.base.Equivalence;
 import com.google.common.collect.Iterables;
+import com.google.common.testing.RelationshipTester.Item;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.ArrayList;
 import java.util.List;
@@ -85,7 +86,7 @@ public final class EqualsTester {
 
   /** Constructs an empty EqualsTester instance */
   public EqualsTester() {
-    this(new RelationshipTester.ItemReporter());
+    this(/* itemReporter= */ Item::toString);
   }
 
   EqualsTester(RelationshipTester.ItemReporter itemReporter) {