Internal change.

RELNOTES=n/a PiperOrigin-RevId: 726922078
google · Feb 14, 2025 · 1769a85 · 1769a85
1 parent 740d8bd
commit 1769a85
Show file tree

Hide file tree

Showing 26 changed files with 41 additions and 28 deletions.
diff --git a/android/guava-tests/test/com/google/common/base/PredicatesTest.java b/android/guava-tests/test/com/google/common/base/PredicatesTest.java
@@ -61,7 +61,7 @@ public boolean apply(@Nullable Integer i) {
 
   /** Instantiable predicate with reasonable hashCode() and equals() methods. */
   static class IsOdd implements Predicate<@Nullable Integer>, Serializable {
-    @GwtIncompatible @J2ktIncompatible     private static final long serialVersionUID = 0x150ddL;
+    @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0x150ddL;
 
     @Override
     public boolean apply(@Nullable Integer i) {

diff --git a/android/guava/src/com/google/common/cache/LongAdder.java b/android/guava/src/com/google/common/cache/LongAdder.java
@@ -43,7 +43,8 @@
  */
 @GwtCompatible(emulated = true)
 final class LongAdder extends Striped64 implements Serializable, LongAddable {
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 7249069246863182397L;
+  @GwtIncompatible @J2ktIncompatible
+  private static final long serialVersionUID = 7249069246863182397L;
 
   /** Version of plus for use in retryUpdate */
   @Override

diff --git a/android/guava/src/com/google/common/collect/AbstractListMultimap.java b/android/guava/src/com/google/common/collect/AbstractListMultimap.java
@@ -142,5 +142,6 @@ public boolean equals(@Nullable Object object) {
     return super.equals(object);
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 6588350623831699109L;
+  @GwtIncompatible @J2ktIncompatible
+  private static final long serialVersionUID = 6588350623831699109L;
 }
diff --git a/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java b/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java
@@ -1643,5 +1643,6 @@ public NavigableMap<K, Collection<V>> tailMap(
     }
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 2447537837011683357L;
+  @GwtIncompatible @J2ktIncompatible
+  private static final long serialVersionUID = 2447537837011683357L;
 }
diff --git a/android/guava/src/com/google/common/collect/AbstractSetMultimap.java b/android/guava/src/com/google/common/collect/AbstractSetMultimap.java
@@ -153,5 +153,6 @@ public boolean equals(@Nullable Object object) {
     return super.equals(object);
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 7431625294878419160L;
+  @GwtIncompatible @J2ktIncompatible
+  private static final long serialVersionUID = 7431625294878419160L;
 }
diff --git a/android/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java b/android/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java
@@ -149,5 +149,6 @@ public Collection<V> values() {
     return super.values();
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 430848587173315748L;
+  @GwtIncompatible @J2ktIncompatible
+  private static final long serialVersionUID = 430848587173315748L;
 }
diff --git a/android/guava/src/com/google/common/collect/ImmutableList.java b/android/guava/src/com/google/common/collect/ImmutableList.java
@@ -864,5 +864,5 @@ ImmutableList<E> buildSorted(Comparator<? super E> comparator) {
     }
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 0xcafebabe;
+  @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe;
 }
diff --git a/android/guava/src/com/google/common/collect/Lists.java b/android/guava/src/com/google/common/collect/Lists.java
@@ -1133,7 +1133,7 @@ public ListIterator<E> listIterator(int index) {
               return backingList.listIterator(index);
             }
 
-            @GwtIncompatible @J2ktIncompatible             private static final long serialVersionUID = 0;
+            @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0;
           };
     } else {
       wrapper =
@@ -1143,7 +1143,7 @@ public ListIterator<E> listIterator(int index) {
               return backingList.listIterator(index);
             }
 
-            @GwtIncompatible @J2ktIncompatible             private static final long serialVersionUID = 0;
+            @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0;
           };
     }
     return wrapper.subList(fromIndex, toIndex);

diff --git a/android/guava/src/com/google/common/collect/Multimaps.java b/android/guava/src/com/google/common/collect/Multimaps.java
@@ -1275,7 +1275,8 @@ public int hashCode() {
       return map.hashCode();
     }
 
-    @GwtIncompatible @J2ktIncompatible     private static final long serialVersionUID = 7845222491160860175L;
+    @GwtIncompatible @J2ktIncompatible
+    private static final long serialVersionUID = 7845222491160860175L;
   }
 
   /**

diff --git a/android/guava/src/com/google/common/hash/LongAdder.java b/android/guava/src/com/google/common/hash/LongAdder.java
@@ -41,7 +41,8 @@
  * @author Doug Lea
  */
 final class LongAdder extends Striped64 implements Serializable, LongAddable {
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 7249069246863182397L;
+  @GwtIncompatible @J2ktIncompatible
+  private static final long serialVersionUID = 7249069246863182397L;
 
   /** Version of plus for use in retryUpdate */
   @Override

diff --git a/guava-tests/test/com/google/common/base/PredicatesTest.java b/guava-tests/test/com/google/common/base/PredicatesTest.java
@@ -61,7 +61,7 @@ public boolean apply(@Nullable Integer i) {
 
   /** Instantiable predicate with reasonable hashCode() and equals() methods. */
   static class IsOdd implements Predicate<@Nullable Integer>, Serializable {
-    @GwtIncompatible @J2ktIncompatible     private static final long serialVersionUID = 0x150ddL;
+    @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0x150ddL;
 
     @Override
     public boolean apply(@Nullable Integer i) {

diff --git a/guava/src/com/google/common/collect/AbstractListMultimap.java b/guava/src/com/google/common/collect/AbstractListMultimap.java
@@ -142,5 +142,6 @@ public boolean equals(@Nullable Object object) {
     return super.equals(object);
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 6588350623831699109L;
+  @GwtIncompatible @J2ktIncompatible
+  private static final long serialVersionUID = 6588350623831699109L;
 }
diff --git a/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java b/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java
@@ -1688,5 +1688,6 @@ public NavigableMap<K, Collection<V>> tailMap(
     }
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 2447537837011683357L;
+  @GwtIncompatible @J2ktIncompatible
+  private static final long serialVersionUID = 2447537837011683357L;
 }
diff --git a/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java b/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java
@@ -349,5 +349,6 @@ private void readObjectNoData() throws ObjectStreamException {
     throw new InvalidObjectException("Stream data required");
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = -2250766705698539974L;
+  @GwtIncompatible @J2ktIncompatible
+  private static final long serialVersionUID = -2250766705698539974L;
 }
diff --git a/guava/src/com/google/common/collect/AbstractSetMultimap.java b/guava/src/com/google/common/collect/AbstractSetMultimap.java
@@ -153,5 +153,6 @@ public boolean equals(@Nullable Object object) {
     return super.equals(object);
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 7431625294878419160L;
+  @GwtIncompatible @J2ktIncompatible
+  private static final long serialVersionUID = 7431625294878419160L;
 }
diff --git a/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java b/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java
@@ -149,5 +149,6 @@ public Collection<V> values() {
     return super.values();
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 430848587173315748L;
+  @GwtIncompatible @J2ktIncompatible
+  private static final long serialVersionUID = 430848587173315748L;
 }
diff --git a/guava/src/com/google/common/collect/ImmutableBiMap.java b/guava/src/com/google/common/collect/ImmutableBiMap.java
@@ -677,5 +677,5 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
     throw new UnsupportedOperationException();
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 0xcafebabe;
+  @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe;
 }
diff --git a/guava/src/com/google/common/collect/ImmutableCollection.java b/guava/src/com/google/common/collect/ImmutableCollection.java
@@ -506,5 +506,5 @@ public Builder<E> addAll(Iterator<? extends E> elements) {
     public abstract ImmutableCollection<E> build();
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 0xcafebabe;
+  @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe;
 }
diff --git a/guava/src/com/google/common/collect/ImmutableList.java b/guava/src/com/google/common/collect/ImmutableList.java
@@ -941,5 +941,5 @@ ImmutableList<E> buildSorted(Comparator<? super E> comparator) {
     }
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 0xcafebabe;
+  @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe;
 }
diff --git a/guava/src/com/google/common/collect/ImmutableMap.java b/guava/src/com/google/common/collect/ImmutableMap.java
@@ -1318,5 +1318,5 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
     throw new InvalidObjectException("Use SerializedForm");
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 0xcafebabe;
+  @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe;
 }
diff --git a/guava/src/com/google/common/collect/ImmutableMultiset.java b/guava/src/com/google/common/collect/ImmutableMultiset.java
@@ -670,5 +670,5 @@ Object readResolve() {
     @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0;
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 0xcafebabe;
+  @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe;
 }
diff --git a/guava/src/com/google/common/collect/ImmutableSet.java b/guava/src/com/google/common/collect/ImmutableSet.java
@@ -996,5 +996,5 @@ private static int estimatedSizeForUnknownDuplication(int inputElementsIncluding
         sqrt(inputElementsIncludingAnyDuplicates, RoundingMode.CEILING));
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 0xcafebabe;
+  @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe;
 }
diff --git a/guava/src/com/google/common/collect/ImmutableSortedSet.java b/guava/src/com/google/common/collect/ImmutableSortedSet.java
@@ -1031,5 +1031,5 @@ public static <Z> ImmutableSortedSet<Z> copyOf(Z[] elements) {
     throw new UnsupportedOperationException();
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 0xcafebabe;
+  @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe;
 }
diff --git a/guava/src/com/google/common/collect/ImmutableTable.java b/guava/src/com/google/common/collect/ImmutableTable.java
@@ -508,5 +508,5 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
     throw new InvalidObjectException("Use SerializedForm");
   }
 
-  @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 0xcafebabe;
+  @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe;
 }
diff --git a/guava/src/com/google/common/collect/Lists.java b/guava/src/com/google/common/collect/Lists.java
@@ -1147,7 +1147,7 @@ public ListIterator<E> listIterator(int index) {
               return backingList.listIterator(index);
             }
 
-            @GwtIncompatible @J2ktIncompatible             private static final long serialVersionUID = 0;
+            @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0;
           };
     } else {
       wrapper =
@@ -1157,7 +1157,7 @@ public ListIterator<E> listIterator(int index) {
               return backingList.listIterator(index);
             }
 
-            @GwtIncompatible @J2ktIncompatible             private static final long serialVersionUID = 0;
+            @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0;
           };
     }
     return wrapper.subList(fromIndex, toIndex);

diff --git a/guava/src/com/google/common/collect/Multimaps.java b/guava/src/com/google/common/collect/Multimaps.java
@@ -1279,7 +1279,8 @@ public int hashCode() {
       return map.hashCode();
     }
 
-    @GwtIncompatible @J2ktIncompatible     private static final long serialVersionUID = 7845222491160860175L;
+    @GwtIncompatible @J2ktIncompatible
+    private static final long serialVersionUID = 7845222491160860175L;
   }
 
   /**
-Original file line number
+Diff line change
@@ Expand Up @@
         }
       }
-      @GwtIncompatible @J2ktIncompatible   private static final long serialVersionUID = 0xcafebabe;
+      @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe;
     }