Remove obsolete @GwtTransient.

And make a field `private` while in the area.

RELNOTES=n/a
PiperOrigin-RevId: 784620182

Author: cpovirk

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

@@ -470,24 +470,14 @@ Iterable<Entry<K, V>> orderEntriesByKey(List<Entry<K, V>> insertionOrder) {
     return insertionOrder;
   }
 
-  /**
-   * Private replacement for {@link com.google.gwt.user.client.rpc.GwtTransient} to work around
-   * build-system quirks.
-   */
-  private @interface GwtTransient {}
-
   /**
    * Compares strings in natural order except that null comes immediately before a given value. This
    * works better than Ordering.natural().nullsFirst() because, if null comes before all other
    * values, it lies outside the submap/submultiset ranges we test, and the variety of tests that
    * exercise null handling fail on those subcollections.
    */
   public abstract static class NullsBefore implements Comparator<@Nullable String>, Serializable {
-    /*
-     * We don't serialize this class in GWT, so we don't care about whether GWT will serialize this
-     * field.
-     */
-    @GwtTransient private final String justAfterNull;
+    private final String justAfterNull;
 
     protected NullsBefore(String justAfterNull) {
       if (justAfterNull == null) {

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

@@ -36,7 +36,7 @@
 @GwtCompatible(emulated = true)
 abstract class AbstractSortedMultiset<E extends @Nullable Object> extends AbstractMultiset<E>
     implements SortedMultiset<E> {
-  @GwtTransient final Comparator<? super E> comparator;
+  private final Comparator<? super E> comparator;
 
   // needed for serialization
   @SuppressWarnings("unchecked")

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

@@ -71,8 +71,8 @@
  */
 @GwtCompatible
 class StandardTable<R, C, V> extends AbstractTable<R, C, V> implements Serializable {
-  @GwtTransient final Map<R, Map<C, V>> backingMap;
-  @GwtTransient final Supplier<? extends Map<C, V>> factory;
+  final Map<R, Map<C, V>> backingMap;
+  final Supplier<? extends Map<C, V>> factory;
 
   StandardTable(Map<R, Map<C, V>> backingMap, Supplier<? extends Map<C, V>> factory) {
     this.backingMap = backingMap;

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

@@ -34,7 +34,7 @@
 @GwtCompatible(emulated = true)
 abstract class AbstractSortedMultiset<E extends @Nullable Object> extends AbstractMultiset<E>
     implements SortedMultiset<E> {
-  @GwtTransient final Comparator<? super E> comparator;
+  private final Comparator<? super E> comparator;
 
   // needed for serialization
   @SuppressWarnings("unchecked")

guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/AbstractSortedMultiset.java

@@ -470,24 +470,14 @@ Iterable<Entry<K, V>> orderEntriesByKey(List<Entry<K, V>> insertionOrder) {
     return insertionOrder;
   }
 
-  /**
-   * Private replacement for {@link com.google.gwt.user.client.rpc.GwtTransient} to work around
-   * build-system quirks.
-   */
-  private @interface GwtTransient {}
-
   /**
    * Compares strings in natural order except that null comes immediately before a given value. This
    * works better than Ordering.natural().nullsFirst() because, if null comes before all other
    * values, it lies outside the submap/submultiset ranges we test, and the variety of tests that
    * exercise null handling fail on those subcollections.
    */
   public abstract static class NullsBefore implements Comparator<@Nullable String>, Serializable {
-    /*
-     * We don't serialize this class in GWT, so we don't care about whether GWT will serialize this
-     * field.
-     */
-    @GwtTransient private final String justAfterNull;
+    private final String justAfterNull;
 
     protected NullsBefore(String justAfterNull) {
       if (justAfterNull == null) {

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

@@ -36,7 +36,7 @@
 @GwtCompatible(emulated = true)
 abstract class AbstractSortedMultiset<E extends @Nullable Object> extends AbstractMultiset<E>
     implements SortedMultiset<E> {
-  @GwtTransient final Comparator<? super E> comparator;
+  private final Comparator<? super E> comparator;
 
   // needed for serialization
   @SuppressWarnings("unchecked")

guava/src/com/google/common/collect/AbstractSortedMultiset.java

@@ -73,8 +73,8 @@
  */
 @GwtCompatible
 class StandardTable<R, C, V> extends AbstractTable<R, C, V> implements Serializable {
-  @GwtTransient final Map<R, Map<C, V>> backingMap;
-  @GwtTransient final Supplier<? extends Map<C, V>> factory;
+  final Map<R, Map<C, V>> backingMap;
+  final Supplier<? extends Map<C, V>> factory;
 
   StandardTable(Map<R, Map<C, V>> backingMap, Supplier<? extends Map<C, V>> factory) {
     this.backingMap = backingMap;