From 1769a857d981fcb15438f6690649d8aed41db7fa Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 14 Feb 2025 07:33:07 -0800 Subject: [PATCH] Internal change. RELNOTES=n/a PiperOrigin-RevId: 726922078 --- .../test/com/google/common/base/PredicatesTest.java | 2 +- android/guava/src/com/google/common/cache/LongAdder.java | 3 ++- .../src/com/google/common/collect/AbstractListMultimap.java | 3 ++- .../com/google/common/collect/AbstractMapBasedMultimap.java | 3 ++- .../src/com/google/common/collect/AbstractSetMultimap.java | 3 ++- .../com/google/common/collect/AbstractSortedSetMultimap.java | 3 ++- .../guava/src/com/google/common/collect/ImmutableList.java | 2 +- android/guava/src/com/google/common/collect/Lists.java | 4 ++-- android/guava/src/com/google/common/collect/Multimaps.java | 3 ++- android/guava/src/com/google/common/hash/LongAdder.java | 3 ++- guava-tests/test/com/google/common/base/PredicatesTest.java | 2 +- guava/src/com/google/common/collect/AbstractListMultimap.java | 3 ++- .../com/google/common/collect/AbstractMapBasedMultimap.java | 3 ++- .../com/google/common/collect/AbstractMapBasedMultiset.java | 3 ++- guava/src/com/google/common/collect/AbstractSetMultimap.java | 3 ++- .../com/google/common/collect/AbstractSortedSetMultimap.java | 3 ++- guava/src/com/google/common/collect/ImmutableBiMap.java | 2 +- guava/src/com/google/common/collect/ImmutableCollection.java | 2 +- guava/src/com/google/common/collect/ImmutableList.java | 2 +- guava/src/com/google/common/collect/ImmutableMap.java | 2 +- guava/src/com/google/common/collect/ImmutableMultiset.java | 2 +- guava/src/com/google/common/collect/ImmutableSet.java | 2 +- guava/src/com/google/common/collect/ImmutableSortedSet.java | 2 +- guava/src/com/google/common/collect/ImmutableTable.java | 2 +- guava/src/com/google/common/collect/Lists.java | 4 ++-- guava/src/com/google/common/collect/Multimaps.java | 3 ++- 26 files changed, 41 insertions(+), 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 index 5e813127e5b9..1b53326958f5 100644 --- 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 index cf6fe050e87d..b9dc05291dd9 100644 --- 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 index 6f257caa9e15..6cb094381af2 100644 --- 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 index 46a500e89e84..dccf030b71c7 100644 --- 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> 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 index ffb956798d71..e46360997300 100644 --- 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 index e76b7cbf4fb6..6441cde91b09 100644 --- 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 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 index 5bea609f792f..b4a58dc38691 100644 --- 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 buildSorted(Comparator 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 index d2dd9497b31d..4840415889ac 100644 --- 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 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 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 index 66a88bbf0314..af3f2f4b2507 100644 --- 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 index 78697205cdd8..70ef21bc4e09 100644 --- 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 index 5e813127e5b9..1b53326958f5 100644 --- 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 index 6f257caa9e15..6cb094381af2 100644 --- 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 index d67979d79e5e..11576619d28e 100644 --- a/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java +++ b/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java @@ -1688,5 +1688,6 @@ public NavigableMap> 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 index 22d1e64a86c2..a2c42672cbdb 100644 --- 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 index ffb956798d71..e46360997300 100644 --- 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 index e76b7cbf4fb6..6441cde91b09 100644 --- a/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java +++ b/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java @@ -149,5 +149,6 @@ public Collection 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 index 613ac480eff4..f2ddca4cbf31 100644 --- 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 index 52976a66f5cb..20b94dd759f6 100644 --- a/guava/src/com/google/common/collect/ImmutableCollection.java +++ b/guava/src/com/google/common/collect/ImmutableCollection.java @@ -506,5 +506,5 @@ public Builder addAll(Iterator elements) { public abstract ImmutableCollection 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 index ff085a8be5a6..fd8635a67419 100644 --- a/guava/src/com/google/common/collect/ImmutableList.java +++ b/guava/src/com/google/common/collect/ImmutableList.java @@ -941,5 +941,5 @@ ImmutableList buildSorted(Comparator 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 index 72d6e2565ebf..729756fa0548 100644 --- 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 index 21565493f221..6f3bc2893aee 100644 --- 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 index 768454379acf..1ce15c3196f5 100644 --- 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 index bd4ecc981b27..4a457b394e44 100644 --- a/guava/src/com/google/common/collect/ImmutableSortedSet.java +++ b/guava/src/com/google/common/collect/ImmutableSortedSet.java @@ -1031,5 +1031,5 @@ public static ImmutableSortedSet 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 index b75541d6a403..600725993cdb 100644 --- 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 index b71bccf37eeb..0d5afd8fc860 100644 --- a/guava/src/com/google/common/collect/Lists.java +++ b/guava/src/com/google/common/collect/Lists.java @@ -1147,7 +1147,7 @@ public ListIterator 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 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 index 621a19445c3e..3d3ebef0a2db 100644 --- 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; } /**