diff --git a/android/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java b/android/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java index 1bd97f84f05a..f0af24bdb27c 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java @@ -27,6 +27,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -109,7 +110,7 @@ void assertPermitted(Exception exception) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static final class UnknownElementException extends RuntimeException { @@ -117,7 +118,7 @@ private UnknownElementException(Collection expected, Object actual) { super("Returned value '" + actual + "' not found. Remaining elements: " + expected); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/android/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java b/android/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java index 13e1b9e032cf..06f8ad5f426c 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -56,5 +57,5 @@ public int compareTo(BaseComparable o) { return s.compareTo(o.s); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava-testlib/src/com/google/common/collect/testing/DerivedComparable.java b/android/guava-testlib/src/com/google/common/collect/testing/DerivedComparable.java index fd9ba97da9b9..df536a685db8 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/DerivedComparable.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/DerivedComparable.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; /** * Simple derived class to verify that we handle generics correctly. @@ -31,5 +32,5 @@ public DerivedComparable(String s) { super(s); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java b/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java index b9fc32b941d9..275100ad1e3e 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java @@ -18,6 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractSet; import java.util.Collection; @@ -325,5 +326,5 @@ public String toString() { return delegate.toString(); } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java b/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java index cbb8b1421aab..d80fa780174c 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java @@ -18,6 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Comparator; @@ -253,5 +254,5 @@ public String toString() { return delegate.toString(); } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/android/guava-testlib/src/com/google/common/collect/testing/features/ConflictingRequirementsException.java b/android/guava-testlib/src/com/google/common/collect/testing/features/ConflictingRequirementsException.java index 3a37dfdd1e67..a588cab1e3ce 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/features/ConflictingRequirementsException.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/features/ConflictingRequirementsException.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.Set; /** @@ -51,5 +52,5 @@ public String getMessage() { return super.getMessage() + " (source: " + source + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java b/android/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java index 6b848afa4586..91178bc41f36 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.Collections; import java.util.Set; import org.jspecify.annotations.Nullable; @@ -80,5 +81,5 @@ public String toString() { return "{TesterRequirements: present=" + presentFeatures + ", absent=" + absentFeatures + "}"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava-testlib/src/com/google/common/collect/testing/google/BiMapInverseTester.java b/android/guava-testlib/src/com/google/common/collect/testing/google/BiMapInverseTester.java index b8f372854489..3389801722a1 100644 --- a/android/guava-testlib/src/com/google/common/collect/testing/google/BiMapInverseTester.java +++ b/android/guava-testlib/src/com/google/common/collect/testing/google/BiMapInverseTester.java @@ -25,6 +25,7 @@ import com.google.common.collect.testing.Helpers; import com.google.common.collect.testing.features.CollectionFeature; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Method; import java.util.Collections; @@ -68,7 +69,7 @@ private static class BiMapPair implements Serializable { this.backward = original.inverse(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/android/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java b/android/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java index 67f11de2e6ed..fe1137cee40d 100644 --- a/android/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java +++ b/android/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java @@ -16,6 +16,7 @@ package com.google.common.testing; +import java.io.Serial; import java.io.Serializable; import junit.framework.AssertionFailedError; import junit.framework.TestCase; @@ -77,11 +78,11 @@ public void testObjectWhichIsEqualButChangesClass() { } private static class ClassWhichDoesNotImplementEquals implements Serializable { - private static final long serialVersionUID = 1L; + @Serial private static final long serialVersionUID = 1L; } private static class ClassWhichIsAlwaysEqualButHasDifferentHashcodes implements Serializable { - private static final long serialVersionUID = 2L; + @Serial private static final long serialVersionUID = 2L; @SuppressWarnings("EqualsHashCode") @Override @@ -91,7 +92,7 @@ public boolean equals(@Nullable Object other) { } private static class ObjectWhichIsEqualButChangesClass implements Serializable { - private static final long serialVersionUID = 1L; + @Serial private static final long serialVersionUID = 1L; @Override public boolean equals(@Nullable Object other) { diff --git a/android/guava-tests/test/com/google/common/base/FunctionsTest.java b/android/guava-tests/test/com/google/common/base/FunctionsTest.java index 947f798ac56a..61aa362801fc 100644 --- a/android/guava-tests/test/com/google/common/base/FunctionsTest.java +++ b/android/guava-tests/test/com/google/common/base/FunctionsTest.java @@ -27,6 +27,7 @@ import com.google.common.testing.EqualsTester; import com.google.common.testing.NullPointerTester; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.Map; import junit.framework.TestCase; @@ -368,7 +369,7 @@ public void testConstantSerializable() { private static class CountingSupplier implements Supplier, Serializable { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; private int value; 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 1b53326958f5..0ad9ab165ad9 100644 --- a/android/guava-tests/test/com/google/common/base/PredicatesTest.java +++ b/android/guava-tests/test/com/google/common/base/PredicatesTest.java @@ -28,6 +28,7 @@ import com.google.common.testing.EqualsTester; import com.google.common.testing.NullPointerTester; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -61,7 +62,8 @@ 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 @Serial + private static final long serialVersionUID = 0x150ddL; @Override public boolean apply(@Nullable Integer i) { @@ -718,7 +720,7 @@ public void testIn_serialization() { public void testIn_handlesNullPointerException() { class CollectionThatThrowsNullPointerException extends ArrayList { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1L; @Override public boolean contains(@Nullable Object element) { @@ -733,7 +735,7 @@ public boolean contains(@Nullable Object element) { public void testIn_handlesClassCastException() { class CollectionThatThrowsClassCastException extends ArrayList { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1L; @Override public boolean contains(@Nullable Object element) { diff --git a/android/guava-tests/test/com/google/common/base/SuppliersTest.java b/android/guava-tests/test/com/google/common/base/SuppliersTest.java index 4a6c68bee726..94d665dbca6a 100644 --- a/android/guava-tests/test/com/google/common/base/SuppliersTest.java +++ b/android/guava-tests/test/com/google/common/base/SuppliersTest.java @@ -30,6 +30,7 @@ import com.google.common.testing.ClassSanityTester; import com.google.common.testing.EqualsTester; import java.io.NotSerializableException; +import java.io.Serial; import java.io.Serializable; import java.time.Duration; import java.util.ArrayList; @@ -74,11 +75,11 @@ public Integer get() { } static class SerializableCountingSupplier extends CountingSupplier implements Serializable { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } static class SerializableThrowingSupplier extends ThrowingSupplier implements Serializable { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } static void checkMemoize(CountingSupplier countingSupplier, Supplier memoizedSupplier) { diff --git a/android/guava-tests/test/com/google/common/collect/Base.java b/android/guava-tests/test/com/google/common/collect/Base.java index 1d9e2836202e..1a0576a6e0bb 100644 --- a/android/guava-tests/test/com/google/common/collect/Base.java +++ b/android/guava-tests/test/com/google/common/collect/Base.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.NullUnmarked; import org.jspecify.annotations.Nullable; @@ -54,5 +55,5 @@ public int compareTo(Base o) { return s.compareTo(o.s); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava-tests/test/com/google/common/collect/Derived.java b/android/guava-tests/test/com/google/common/collect/Derived.java index 046853509f6b..dd6ea6aed250 100644 --- a/android/guava-tests/test/com/google/common/collect/Derived.java +++ b/android/guava-tests/test/com/google/common/collect/Derived.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import org.jspecify.annotations.NullUnmarked; /** Simple derived class to verify that we handle generics correctly. */ @@ -29,5 +30,5 @@ public Derived(String s) { super(s); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava-tests/test/com/google/common/collect/HashMultisetTest.java b/android/guava-tests/test/com/google/common/collect/HashMultisetTest.java index f978ebb4d321..de2ac55ae4a1 100644 --- a/android/guava-tests/test/com/google/common/collect/HashMultisetTest.java +++ b/android/guava-tests/test/com/google/common/collect/HashMultisetTest.java @@ -27,6 +27,7 @@ import com.google.common.collect.testing.google.MultisetTestSuiteBuilder; import com.google.common.collect.testing.google.TestStringMultisetGenerator; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import junit.framework.Test; import junit.framework.TestCase; @@ -115,7 +116,7 @@ private static class MultisetHolder implements Serializable { this.member = multiset; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1L; } @J2ktIncompatible diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableMapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableMapTest.java index a85266620561..18dc494ccf83 100644 --- a/android/guava-tests/test/com/google/common/collect/ImmutableMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/ImmutableMapTest.java @@ -47,6 +47,7 @@ import com.google.common.testing.NullPointerTester; import java.io.ByteArrayOutputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractMap; import java.util.Collection; @@ -873,7 +874,7 @@ public int hashCode() { return value; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 5; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 5; } public void testMutableValues() { diff --git a/android/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java b/android/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java index e1d4139b0c9d..c1c112147325 100644 --- a/android/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java @@ -38,6 +38,7 @@ import com.google.common.collect.testing.google.SortedMapGenerators.ImmutableSortedMapValueListGenerator; import com.google.common.testing.NullPointerTester; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.Collections; import java.util.Comparator; @@ -676,7 +677,7 @@ public int hashCode() { return value; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 5; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 5; } public void testMutableValues() { diff --git a/android/guava-tests/test/com/google/common/collect/LegacyComparable.java b/android/guava-tests/test/com/google/common/collect/LegacyComparable.java index 941471b7a2f3..d30b82514d33 100644 --- a/android/guava-tests/test/com/google/common/collect/LegacyComparable.java +++ b/android/guava-tests/test/com/google/common/collect/LegacyComparable.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.NullMarked; import org.jspecify.annotations.Nullable; @@ -70,5 +71,5 @@ public int hashCode() { return value.hashCode(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava-tests/test/com/google/common/collect/ListsTest.java b/android/guava-tests/test/com/google/common/collect/ListsTest.java index 69e0440801f2..55da17b0b147 100644 --- a/android/guava-tests/test/com/google/common/collect/ListsTest.java +++ b/android/guava-tests/test/com/google/common/collect/ListsTest.java @@ -48,6 +48,7 @@ import com.google.common.collect.testing.google.ListGenerators.CharactersOfStringGenerator; import com.google.common.testing.NullPointerTester; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; @@ -91,7 +92,7 @@ public Iterator iterator() { return SOME_COLLECTION.iterator(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static final List SOME_LIST = Lists.newArrayList(1, 2, 3, 4); @@ -108,7 +109,7 @@ public String apply(Number n) { return String.valueOf(n); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @J2ktIncompatible diff --git a/android/guava-tests/test/com/google/common/collect/LockHeldAssertingSet.java b/android/guava-tests/test/com/google/common/collect/LockHeldAssertingSet.java index 90ce704a6661..b861186aa6fa 100644 --- a/android/guava-tests/test/com/google/common/collect/LockHeldAssertingSet.java +++ b/android/guava-tests/test/com/google/common/collect/LockHeldAssertingSet.java @@ -19,6 +19,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static junit.framework.Assert.assertTrue; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Set; @@ -154,5 +155,5 @@ public T[] toArray(T[] a) { return super.toArray(a); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava-tests/test/com/google/common/collect/MultimapsTest.java b/android/guava-tests/test/com/google/common/collect/MultimapsTest.java index efd47462f70c..0e457d8e9970 100644 --- a/android/guava-tests/test/com/google/common/collect/MultimapsTest.java +++ b/android/guava-tests/test/com/google/common/collect/MultimapsTest.java @@ -46,6 +46,7 @@ import com.google.common.testing.EqualsTester; import com.google.common.testing.NullPointerTester; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -552,7 +553,7 @@ public Queue getImpl() { return new LinkedList<>(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } public void testNewMultimapWithCollectionRejectingNegativeElements() { @@ -646,7 +647,7 @@ public LinkedList getImpl() { return new LinkedList<>(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } public void testNewListMultimap() { @@ -682,7 +683,7 @@ public Set getImpl() { return new HashSet<>(4); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } public void testNewSetMultimap() { @@ -714,7 +715,7 @@ public TreeSet getImpl() { return Sets.newTreeSet(INT_COMPARATOR); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } public void testNewSortedSetMultimap() { diff --git a/android/guava-tests/test/com/google/common/collect/OrderingTest.java b/android/guava-tests/test/com/google/common/collect/OrderingTest.java index 0f3925532c96..a54b89b4c3fe 100644 --- a/android/guava-tests/test/com/google/common/collect/OrderingTest.java +++ b/android/guava-tests/test/com/google/common/collect/OrderingTest.java @@ -41,6 +41,7 @@ import com.google.common.collect.testing.Helpers; import com.google.common.testing.EqualsTester; import com.google.common.testing.NullPointerTester; +import java.io.Serial; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; @@ -841,7 +842,7 @@ public boolean equals(@Nullable Object other) { return other instanceof NumberOrdering; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /* diff --git a/android/guava-tests/test/com/google/common/collect/SpecialRandom.java b/android/guava-tests/test/com/google/common/collect/SpecialRandom.java index 571a061f74ae..23f9de09542b 100644 --- a/android/guava-tests/test/com/google/common/collect/SpecialRandom.java +++ b/android/guava-tests/test/com/google/common/collect/SpecialRandom.java @@ -16,6 +16,7 @@ package com.google.common.collect; +import java.io.Serial; import java.util.Random; import org.jspecify.annotations.NullUnmarked; @@ -52,5 +53,5 @@ public String toString() { return hasSeed ? "(seed:" + seed : "(default seed)"; } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java index c599d10c5618..176219da167b 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java @@ -26,6 +26,7 @@ import com.google.common.collect.testing.google.BiMapInverseTester; import com.google.common.collect.testing.google.BiMapTestSuiteBuilder; import com.google.common.collect.testing.google.TestStringBiMapGenerator; +import java.io.Serial; import java.util.Map.Entry; import java.util.Set; import junit.framework.TestSuite; @@ -133,7 +134,7 @@ public Set values() { return delegate.values(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } public void testForcePut() { diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java index 6f0f7a734cec..538866cd7b81 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java @@ -16,6 +16,7 @@ package com.google.common.collect; +import java.io.Serial; import java.util.ArrayDeque; import java.util.Collection; import java.util.Deque; @@ -254,7 +255,7 @@ public Iterator descendingIterator() { return delegate.descendingIterator(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } @SuppressWarnings("CheckReturnValue") diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java index b1ab77b6ff46..533b6a0f1cd9 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java @@ -21,6 +21,7 @@ import com.google.common.collect.Synchronized.SynchronizedCollection; import com.google.common.collect.Synchronized.SynchronizedSet; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.HashMap; @@ -151,7 +152,7 @@ public String toString() { return super.toString(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } /* diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java index f5f322d202cf..4c54961baf0f 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java @@ -26,6 +26,7 @@ import com.google.common.collect.testing.features.MapFeature; import com.google.common.collect.testing.google.SetMultimapTestSuiteBuilder; import com.google.common.collect.testing.google.TestStringSetMultimapGenerator; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Map; @@ -219,7 +220,7 @@ public Map> asMap() { return super.asMap(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } public void testSynchronizedListMultimap() { diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java index 4e1f5b336e17..c228ff636667 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java @@ -26,6 +26,7 @@ import com.google.common.collect.testing.features.CollectionSize; import com.google.common.collect.testing.features.MapFeature; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; import java.util.Map.Entry; @@ -97,7 +98,7 @@ public V setValue(V value) { return super.setValue(value); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } static class TestMap extends SynchronizedMapTest.TestMap @@ -254,7 +255,7 @@ public K lastKey() { return delegate().lastKey(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } @AndroidIncompatible // test-suite builders diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java index 287599ff6243..60d551c740e3 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java @@ -23,6 +23,7 @@ import com.google.common.collect.testing.TestStringSortedSetGenerator; import com.google.common.collect.testing.features.CollectionFeature; import com.google.common.collect.testing.features.CollectionSize; +import java.io.Serial; import java.util.Collections; import java.util.Comparator; import java.util.Iterator; @@ -161,7 +162,7 @@ public E last() { return delegate().last(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } @AndroidIncompatible // test-suite builders diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java index 4f236aa7b84d..6c227f3fb122 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java @@ -16,6 +16,7 @@ package com.google.common.collect; +import java.io.Serial; import java.util.ArrayDeque; import java.util.Collection; import java.util.Iterator; @@ -152,7 +153,7 @@ public T[] toArray(T[] array) { return delegate.toArray(array); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } @SuppressWarnings("CheckReturnValue") diff --git a/android/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java b/android/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java index a80315812249..909cb97d7769 100644 --- a/android/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java +++ b/android/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java @@ -16,6 +16,7 @@ package com.google.common.collect; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Map; @@ -162,7 +163,7 @@ public Map> rowMap() { return delegate.rowMap(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } @Override diff --git a/android/guava-tests/test/com/google/common/eventbus/SubscriberTest.java b/android/guava-tests/test/com/google/common/eventbus/SubscriberTest.java index 4c9bbb7b6254..42d269cd0ae9 100644 --- a/android/guava-tests/test/com/google/common/eventbus/SubscriberTest.java +++ b/android/guava-tests/test/com/google/common/eventbus/SubscriberTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertThrows; import com.google.common.testing.EqualsTester; +import java.io.Serial; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import junit.framework.TestCase; @@ -127,7 +128,7 @@ public void exceptionThrowingMethod(Object arg) throws Exception { /** Local exception subclass to check variety of exception thrown. */ class IntentionalException extends Exception { - private static final long serialVersionUID = -2500191180248181379L; + @Serial private static final long serialVersionUID = -2500191180248181379L; } @Subscribe @@ -142,6 +143,6 @@ public void threadSafeMethod(Object arg) {} /** Local Error subclass to check variety of error thrown. */ class JudgmentError extends Error { - private static final long serialVersionUID = 634248373797713373L; + @Serial private static final long serialVersionUID = 634248373797713373L; } } diff --git a/android/guava-tests/test/com/google/common/io/FilesTest.java b/android/guava-tests/test/com/google/common/io/FilesTest.java index 1111471e185e..e4651233ed55 100644 --- a/android/guava-tests/test/com/google/common/io/FilesTest.java +++ b/android/guava-tests/test/com/google/common/io/FilesTest.java @@ -33,6 +33,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.RandomAccessFile; +import java.io.Serial; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel.MapMode; @@ -116,7 +117,7 @@ public long length() { return badLength; } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } public void testToString() throws IOException { @@ -275,7 +276,7 @@ public boolean setLastModified(long t) { return false; } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; })); } @@ -405,7 +406,7 @@ public boolean delete() { return canDelete && super.delete(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } public void testLineReading() throws IOException { diff --git a/android/guava/src/com/google/common/base/Absent.java b/android/guava/src/com/google/common/base/Absent.java index f9aff2a3229d..43c63239079c 100644 --- a/android/guava/src/com/google/common/base/Absent.java +++ b/android/guava/src/com/google/common/base/Absent.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.Collections; import java.util.Set; import org.jspecify.annotations.Nullable; @@ -97,5 +98,5 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/base/CaseFormat.java b/android/guava/src/com/google/common/base/CaseFormat.java index c3b1afe9cf3e..54d3bab0bcfc 100644 --- a/android/guava/src/com/google/common/base/CaseFormat.java +++ b/android/guava/src/com/google/common/base/CaseFormat.java @@ -20,6 +20,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -204,7 +205,7 @@ public String toString() { return sourceFormat + ".converterTo(" + targetFormat + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } abstract String normalizeWord(String word); diff --git a/android/guava/src/com/google/common/base/Converter.java b/android/guava/src/com/google/common/base/Converter.java index 270dcc1f75ee..be2e7941a67e 100644 --- a/android/guava/src/com/google/common/base/Converter.java +++ b/android/guava/src/com/google/common/base/Converter.java @@ -25,6 +25,7 @@ import com.google.errorprone.annotations.InlineMe; import com.google.errorprone.annotations.concurrent.LazyInit; import com.google.j2objc.annotations.RetainedWith; +import java.io.Serial; import java.io.Serializable; import java.util.Iterator; import org.jspecify.annotations.Nullable; @@ -361,7 +362,7 @@ public String toString() { return original + ".reverse()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } /** @@ -436,7 +437,7 @@ public String toString() { return first + ".andThen(" + second + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } /** @@ -595,6 +596,6 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } } diff --git a/android/guava/src/com/google/common/base/Enums.java b/android/guava/src/com/google/common/base/Enums.java index 02bb3efb50e3..8f0a8c915280 100644 --- a/android/guava/src/com/google/common/base/Enums.java +++ b/android/guava/src/com/google/common/base/Enums.java @@ -18,6 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.lang.ref.WeakReference; import java.lang.reflect.Field; @@ -150,6 +151,6 @@ public String toString() { return "Enums.stringConverter(" + enumClass.getName() + ".class)"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } } diff --git a/android/guava/src/com/google/common/base/Equivalence.java b/android/guava/src/com/google/common/base/Equivalence.java index 97c6c13739e1..9a0e71ea12b1 100644 --- a/android/guava/src/com/google/common/base/Equivalence.java +++ b/android/guava/src/com/google/common/base/Equivalence.java @@ -20,6 +20,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.ForOverride; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; @@ -244,7 +245,7 @@ public String toString() { return equivalence + ".wrap(" + reference + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -315,7 +316,7 @@ public String toString() { return equivalence + ".equivalentTo(" + target + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -362,7 +363,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } static final class Identity extends Equivalence implements Serializable { @@ -383,6 +384,6 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } } diff --git a/android/guava/src/com/google/common/base/FunctionalEquivalence.java b/android/guava/src/com/google/common/base/FunctionalEquivalence.java index 3c50db2d8530..6a98b3eb0502 100644 --- a/android/guava/src/com/google/common/base/FunctionalEquivalence.java +++ b/android/guava/src/com/google/common/base/FunctionalEquivalence.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -31,7 +32,7 @@ @GwtCompatible final class FunctionalEquivalence extends Equivalence implements Serializable { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; private final Function function; private final Equivalence resultEquivalence; diff --git a/android/guava/src/com/google/common/base/Functions.java b/android/guava/src/com/google/common/base/Functions.java index f67859fcf59c..333a83581be1 100644 --- a/android/guava/src/com/google/common/base/Functions.java +++ b/android/guava/src/com/google/common/base/Functions.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Map; import org.jspecify.annotations.Nullable; @@ -179,7 +180,7 @@ public String toString() { return "Functions.forMap(" + map + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static class ForMapWithDefault @@ -222,7 +223,7 @@ public String toString() { return "Functions.forMap(" + map + ", defaultValue=" + defaultValue + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -279,7 +280,7 @@ public String toString() { return g + "(" + f + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -330,7 +331,7 @@ public String toString() { return "Functions.forPredicate(" + predicate + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -379,7 +380,7 @@ public String toString() { return "Functions.constant(" + value + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -431,6 +432,6 @@ public String toString() { return "Functions.forSupplier(" + supplier + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/android/guava/src/com/google/common/base/JdkPattern.java b/android/guava/src/com/google/common/base/JdkPattern.java index 66bf460e8bdc..54a2c779900a 100644 --- a/android/guava/src/com/google/common/base/JdkPattern.java +++ b/android/guava/src/com/google/common/base/JdkPattern.java @@ -16,6 +16,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -87,5 +88,5 @@ public int start() { } } - @J2ktIncompatible private static final long serialVersionUID = 0; + @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/base/Optional.java b/android/guava/src/com/google/common/base/Optional.java index f5d68bf38a0b..8bcd68dd854e 100644 --- a/android/guava/src/com/google/common/base/Optional.java +++ b/android/guava/src/com/google/common/base/Optional.java @@ -20,6 +20,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.DoNotMock; +import java.io.Serial; import java.io.Serializable; import java.util.Iterator; import java.util.Set; @@ -367,5 +368,5 @@ public static Iterable presentInstances( }; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/base/PairwiseEquivalence.java b/android/guava/src/com/google/common/base/PairwiseEquivalence.java index bb4ffd068fb7..7c406772d816 100644 --- a/android/guava/src/com/google/common/base/PairwiseEquivalence.java +++ b/android/guava/src/com/google/common/base/PairwiseEquivalence.java @@ -17,6 +17,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Iterator; import org.jspecify.annotations.Nullable; @@ -74,5 +75,5 @@ public String toString() { return elementEquivalence + ".pairwise()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } diff --git a/android/guava/src/com/google/common/base/Predicates.java b/android/guava/src/com/google/common/base/Predicates.java index db3eef0d6037..3a39502b4efe 100644 --- a/android/guava/src/com/google/common/base/Predicates.java +++ b/android/guava/src/com/google/common/base/Predicates.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -353,7 +354,7 @@ public String toString() { return "Predicates.not(" + predicate + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -398,7 +399,7 @@ public String toString() { return toStringHelper("and", components); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -443,7 +444,7 @@ public String toString() { return toStringHelper("or", components); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static String toStringHelper(String methodName, Iterable components) { @@ -493,7 +494,7 @@ public String toString() { return "Predicates.equalTo(" + target + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; @SuppressWarnings("unchecked") // safe contravariant cast Predicate withNarrowedType() { @@ -537,7 +538,7 @@ public String toString() { return "Predicates.instanceOf(" + clazz.getName() + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -576,7 +577,7 @@ public String toString() { return "Predicates.subtypeOf(" + clazz.getName() + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -618,7 +619,7 @@ public String toString() { return "Predicates.in(" + target + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -659,7 +660,7 @@ public String toString() { return p + "(" + f + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -709,7 +710,7 @@ public String toString() { return "Predicates.contains(" + patternString + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -727,7 +728,7 @@ public String toString() { return "Predicates.containsPattern(" + pattern.pattern() + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static List> asList( diff --git a/android/guava/src/com/google/common/base/Present.java b/android/guava/src/com/google/common/base/Present.java index dcf6623aaba8..bfbf0076bb4a 100644 --- a/android/guava/src/com/google/common/base/Present.java +++ b/android/guava/src/com/google/common/base/Present.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.Collections; import java.util.Set; import org.jspecify.annotations.Nullable; @@ -97,5 +98,5 @@ public String toString() { return "Optional.of(" + reference + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/base/Suppliers.java b/android/guava/src/com/google/common/base/Suppliers.java index 28cf8e2a4b6d..2683c2e5376a 100644 --- a/android/guava/src/com/google/common/base/Suppliers.java +++ b/android/guava/src/com/google/common/base/Suppliers.java @@ -25,6 +25,7 @@ import com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.time.Duration; import java.util.concurrent.TimeUnit; @@ -89,7 +90,7 @@ public String toString() { return "Suppliers.compose(" + function + ", " + supplier + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -166,7 +167,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE lock = new Object(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @VisibleForTesting @@ -340,7 +341,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE lock = new Object(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** Returns a supplier that always supplies {@code instance}. */ @@ -382,7 +383,7 @@ public String toString() { return "Suppliers.ofInstance(" + instance + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -417,7 +418,7 @@ public String toString() { return "Suppliers.synchronizedSupplier(" + delegate + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/android/guava/src/com/google/common/cache/CacheLoader.java b/android/guava/src/com/google/common/cache/CacheLoader.java index adfbf6cd15aa..d82edaa8ac04 100644 --- a/android/guava/src/com/google/common/cache/CacheLoader.java +++ b/android/guava/src/com/google/common/cache/CacheLoader.java @@ -24,6 +24,7 @@ import com.google.common.base.Supplier; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFutureTask; +import java.io.Serial; import java.io.Serializable; import java.util.Map; import java.util.concurrent.Executor; @@ -170,7 +171,7 @@ public V load(K key) { return computingFunction.apply(checkNotNull(key)); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -222,7 +223,7 @@ public V load(Object key) { return computingSupplier.get(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/android/guava/src/com/google/common/cache/LocalCache.java b/android/guava/src/com/google/common/cache/LocalCache.java index 24adfcb7712e..d85150de85e3 100644 --- a/android/guava/src/com/google/common/cache/LocalCache.java +++ b/android/guava/src/com/google/common/cache/LocalCache.java @@ -60,6 +60,7 @@ import java.io.IOException; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; @@ -4493,7 +4494,7 @@ public boolean remove(Object o) { */ static class ManualSerializationProxy extends ForwardingCache implements Serializable { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; final Strength keyStrength; final Strength valueStrength; @@ -4611,7 +4612,7 @@ protected Cache delegate() { */ static final class LoadingSerializationProxy extends ManualSerializationProxy implements LoadingCache { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; transient @Nullable LoadingCache autoDelegate; @@ -4744,7 +4745,7 @@ public void cleanUp() { // Serialization Support - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; Object writeReplace() { return new ManualSerializationProxy<>(localCache); @@ -4797,7 +4798,7 @@ public final V apply(K key) { // Serialization Support - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; @Override Object writeReplace() { diff --git a/android/guava/src/com/google/common/cache/LongAdder.java b/android/guava/src/com/google/common/cache/LongAdder.java index b9dc05291dd9..8cbc2d5c9c21 100644 --- a/android/guava/src/com/google/common/cache/LongAdder.java +++ b/android/guava/src/com/google/common/cache/LongAdder.java @@ -17,6 +17,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.concurrent.atomic.AtomicLong; @@ -43,7 +44,7 @@ */ @GwtCompatible(emulated = true) final class LongAdder extends Striped64 implements Serializable, LongAddable { - @GwtIncompatible @J2ktIncompatible + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 7249069246863182397L; /** Version of plus for use in retryUpdate */ diff --git a/android/guava/src/com/google/common/cache/RemovalNotification.java b/android/guava/src/com/google/common/cache/RemovalNotification.java index e95c5e202140..fb32942c864b 100644 --- a/android/guava/src/com/google/common/cache/RemovalNotification.java +++ b/android/guava/src/com/google/common/cache/RemovalNotification.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.AbstractMap.SimpleImmutableEntry; import org.jspecify.annotations.Nullable; @@ -68,5 +69,5 @@ public boolean wasEvicted() { return cause.wasEvicted(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/AbstractBiMap.java b/android/guava/src/com/google/common/collect/AbstractBiMap.java index 9d94df3991ef..59a32cd62efb 100644 --- a/android/guava/src/com/google/common/collect/AbstractBiMap.java +++ b/android/guava/src/com/google/common/collect/AbstractBiMap.java @@ -32,6 +32,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; @@ -483,8 +484,8 @@ Object readResolve() { return inverse().inverse(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/AbstractListMultimap.java b/android/guava/src/com/google/common/collect/AbstractListMultimap.java index 6cb094381af2..020e1ac49fd5 100644 --- a/android/guava/src/com/google/common/collect/AbstractListMultimap.java +++ b/android/guava/src/com/google/common/collect/AbstractListMultimap.java @@ -23,6 +23,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.util.Collection; import java.util.List; import java.util.Map; @@ -142,6 +143,6 @@ public boolean equals(@Nullable Object object) { return super.equals(object); } - @GwtIncompatible @J2ktIncompatible + @GwtIncompatible @J2ktIncompatible @Serial 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 5adf6319c2ee..775e3feb8aa7 100644 --- a/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java +++ b/android/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java @@ -29,6 +29,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.collect.Maps.ViewCachingAbstractMap; import com.google.j2objc.annotations.WeakOuter; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractCollection; import java.util.Collection; @@ -1636,6 +1637,6 @@ public NavigableMap> tailMap( } } - @GwtIncompatible @J2ktIncompatible + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 2447537837011683357L; } diff --git a/android/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java b/android/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java index c46700b18921..9c24464c2ddb 100644 --- a/android/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java +++ b/android/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.ConcurrentModificationException; import java.util.Iterator; @@ -269,5 +270,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMultiset(this, stream, distinctElements); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/AbstractSetMultimap.java b/android/guava/src/com/google/common/collect/AbstractSetMultimap.java index e46360997300..f94f454aa53f 100644 --- a/android/guava/src/com/google/common/collect/AbstractSetMultimap.java +++ b/android/guava/src/com/google/common/collect/AbstractSetMultimap.java @@ -23,6 +23,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; @@ -153,6 +154,6 @@ public boolean equals(@Nullable Object object) { return super.equals(object); } - @GwtIncompatible @J2ktIncompatible + @GwtIncompatible @J2ktIncompatible @Serial 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 6441cde91b09..bdd5ded9066c 100644 --- a/android/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java +++ b/android/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java @@ -23,6 +23,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.util.Collection; import java.util.Map; import java.util.NavigableSet; @@ -149,6 +150,6 @@ public Collection values() { return super.values(); } - @GwtIncompatible @J2ktIncompatible + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 430848587173315748L; } diff --git a/android/guava/src/com/google/common/collect/AllEqualOrdering.java b/android/guava/src/com/google/common/collect/AllEqualOrdering.java index e6d515c95fcc..2f39370222dc 100644 --- a/android/guava/src/com/google/common/collect/AllEqualOrdering.java +++ b/android/guava/src/com/google/common/collect/AllEqualOrdering.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.List; import org.jspecify.annotations.Nullable; @@ -63,5 +64,5 @@ public String toString() { return "Ordering.allEqual()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/ArrayListMultimap.java b/android/guava/src/com/google/common/collect/ArrayListMultimap.java index fa87ffbcf1e8..65eb2dd6f000 100644 --- a/android/guava/src/com/google/common/collect/ArrayListMultimap.java +++ b/android/guava/src/com/google/common/collect/ArrayListMultimap.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -175,5 +176,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMultimap(this, stream, distinctKeys); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/ArrayTable.java b/android/guava/src/com/google/common/collect/ArrayTable.java index a9dd02905c48..c6b526bc9877 100644 --- a/android/guava/src/com/google/common/collect/ArrayTable.java +++ b/android/guava/src/com/google/common/collect/ArrayTable.java @@ -31,6 +31,7 @@ import com.google.errorprone.annotations.DoNotCall; import com.google.errorprone.annotations.concurrent.LazyInit; import com.google.j2objc.annotations.WeakOuter; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Array; import java.util.Arrays; @@ -786,5 +787,5 @@ String getKeyRole() { }; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/ByFunctionOrdering.java b/android/guava/src/com/google/common/collect/ByFunctionOrdering.java index 143e7be5562b..909da420385f 100644 --- a/android/guava/src/com/google/common/collect/ByFunctionOrdering.java +++ b/android/guava/src/com/google/common/collect/ByFunctionOrdering.java @@ -23,6 +23,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Function; import com.google.common.base.Objects; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -68,5 +69,5 @@ public String toString() { return ordering + ".onResultOf(" + function + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/ComparatorOrdering.java b/android/guava/src/com/google/common/collect/ComparatorOrdering.java index 410875167955..9af3781f65ef 100644 --- a/android/guava/src/com/google/common/collect/ComparatorOrdering.java +++ b/android/guava/src/com/google/common/collect/ComparatorOrdering.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; import org.jspecify.annotations.Nullable; @@ -62,5 +63,5 @@ public String toString() { return comparator.toString(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/CompoundOrdering.java b/android/guava/src/com/google/common/collect/CompoundOrdering.java index 6e922f3316bc..26e0b4784e42 100644 --- a/android/guava/src/com/google/common/collect/CompoundOrdering.java +++ b/android/guava/src/com/google/common/collect/CompoundOrdering.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Comparator; @@ -74,5 +75,5 @@ public String toString() { return "Ordering.compound(" + Arrays.toString(comparators) + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/ComputationException.java b/android/guava/src/com/google/common/collect/ComputationException.java index d5f6bcd26a82..cadb1719f567 100644 --- a/android/guava/src/com/google/common/collect/ComputationException.java +++ b/android/guava/src/com/google/common/collect/ComputationException.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import org.jspecify.annotations.Nullable; /** @@ -42,5 +43,5 @@ public ComputationException(@Nullable Throwable cause) { super(cause); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java b/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java index ea831cd57562..233a66b572fe 100644 --- a/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java +++ b/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java @@ -36,6 +36,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; @@ -608,5 +609,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo FieldSettersHolder.COUNT_MAP_FIELD_SETTER.set(this, deserializedCountMap); } - private static final long serialVersionUID = 1; + @Serial private static final long serialVersionUID = 1; } diff --git a/android/guava/src/com/google/common/collect/Cut.java b/android/guava/src/com/google/common/collect/Cut.java index 4d682aee35d4..3c220f531124 100644 --- a/android/guava/src/com/google/common/collect/Cut.java +++ b/android/guava/src/com/google/common/collect/Cut.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.NoSuchElementException; import org.jspecify.annotations.Nullable; @@ -117,7 +118,7 @@ static Cut belowAll() { return (Cut) BelowAll.INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; private static final class BelowAll extends Cut> { private static final BelowAll INSTANCE = new BelowAll(); @@ -212,7 +213,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /* @@ -303,7 +304,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static Cut belowValue(C endpoint) { @@ -384,7 +385,7 @@ public String toString() { return "\\" + endpoint + "/"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static Cut aboveValue(C endpoint) { @@ -471,6 +472,6 @@ public String toString() { return "/" + endpoint + "\\"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/android/guava/src/com/google/common/collect/DiscreteDomain.java b/android/guava/src/com/google/common/collect/DiscreteDomain.java index 13e7be404726..feef267b9861 100644 --- a/android/guava/src/com/google/common/collect/DiscreteDomain.java +++ b/android/guava/src/com/google/common/collect/DiscreteDomain.java @@ -24,6 +24,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.primitives.Ints; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.io.Serializable; import java.math.BigInteger; import java.util.NoSuchElementException; @@ -110,7 +111,7 @@ public String toString() { return "DiscreteDomain.integers()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -185,7 +186,7 @@ public String toString() { return "DiscreteDomain.longs()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -241,7 +242,7 @@ public String toString() { return "DiscreteDomain.bigIntegers()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } final boolean supportsFastOffset; diff --git a/android/guava/src/com/google/common/collect/EmptyContiguousSet.java b/android/guava/src/com/google/common/collect/EmptyContiguousSet.java index 2f02a9e430bb..5f96fe880991 100644 --- a/android/guava/src/com/google/common/collect/EmptyContiguousSet.java +++ b/android/guava/src/com/google/common/collect/EmptyContiguousSet.java @@ -20,6 +20,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.NoSuchElementException; import java.util.Set; @@ -158,7 +159,7 @@ private Object readResolve() { return new EmptyContiguousSet<>(domain); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @GwtIncompatible // serialization diff --git a/android/guava/src/com/google/common/collect/EmptyImmutableListMultimap.java b/android/guava/src/com/google/common/collect/EmptyImmutableListMultimap.java index 86aa27dbfb51..91eddaac0816 100644 --- a/android/guava/src/com/google/common/collect/EmptyImmutableListMultimap.java +++ b/android/guava/src/com/google/common/collect/EmptyImmutableListMultimap.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.Collection; /** @@ -49,5 +50,5 @@ private Object readResolve() { return INSTANCE; // preserve singleton property } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/EmptyImmutableSetMultimap.java b/android/guava/src/com/google/common/collect/EmptyImmutableSetMultimap.java index 7e713d32f18f..54450c7033cc 100644 --- a/android/guava/src/com/google/common/collect/EmptyImmutableSetMultimap.java +++ b/android/guava/src/com/google/common/collect/EmptyImmutableSetMultimap.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.Collection; /** @@ -49,5 +50,5 @@ private Object readResolve() { return INSTANCE; // preserve singleton property } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/EnumBiMap.java b/android/guava/src/com/google/common/collect/EnumBiMap.java index f8f430c2f642..20d2306113d8 100644 --- a/android/guava/src/com/google/common/collect/EnumBiMap.java +++ b/android/guava/src/com/google/common/collect/EnumBiMap.java @@ -27,6 +27,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.EnumMap; import java.util.Map; @@ -158,5 +159,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMap(this, stream); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/EnumHashBiMap.java b/android/guava/src/com/google/common/collect/EnumHashBiMap.java index b585d571b5ae..316a3765d5af 100644 --- a/android/guava/src/com/google/common/collect/EnumHashBiMap.java +++ b/android/guava/src/com/google/common/collect/EnumHashBiMap.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.EnumMap; import java.util.HashMap; import java.util.Map; @@ -135,5 +136,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMap(this, stream); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/EnumMultiset.java b/android/guava/src/com/google/common/collect/EnumMultiset.java index c3ffa0ad6641..a6a1f9866bf9 100644 --- a/android/guava/src/com/google/common/collect/EnumMultiset.java +++ b/android/guava/src/com/google/common/collect/EnumMultiset.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Iterator; @@ -306,5 +307,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMultiset(this, stream); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/EvictingQueue.java b/android/guava/src/com/google/common/collect/EvictingQueue.java index 957d10b7eb76..f7d7d095fe9c 100644 --- a/android/guava/src/com/google/common/collect/EvictingQueue.java +++ b/android/guava/src/com/google/common/collect/EvictingQueue.java @@ -24,6 +24,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayDeque; import java.util.Collection; @@ -141,5 +142,5 @@ public Object[] toArray() { return super.toArray(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } diff --git a/android/guava/src/com/google/common/collect/ExplicitOrdering.java b/android/guava/src/com/google/common/collect/ExplicitOrdering.java index 412bcf1613b3..d5d6736395c2 100644 --- a/android/guava/src/com/google/common/collect/ExplicitOrdering.java +++ b/android/guava/src/com/google/common/collect/ExplicitOrdering.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.List; import org.jspecify.annotations.Nullable; @@ -68,5 +69,5 @@ public String toString() { return "Ordering.explicit(" + rankMap.keySet() + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/HashBasedTable.java b/android/guava/src/com/google/common/collect/HashBasedTable.java index db3f7d660af1..9f943e013a3e 100644 --- a/android/guava/src/com/google/common/collect/HashBasedTable.java +++ b/android/guava/src/com/google/common/collect/HashBasedTable.java @@ -22,6 +22,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Supplier; +import java.io.Serial; import java.io.Serializable; import java.util.LinkedHashMap; import java.util.Map; @@ -62,7 +63,7 @@ public Map get() { return Maps.newLinkedHashMapWithExpectedSize(expectedSize); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** Creates an empty {@code HashBasedTable}. */ @@ -103,5 +104,5 @@ public static HashBasedTable create( super(backingMap, factory); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/HashMultimap.java b/android/guava/src/com/google/common/collect/HashMultimap.java index 719c0b40f66e..7c7c3dbacd39 100644 --- a/android/guava/src/com/google/common/collect/HashMultimap.java +++ b/android/guava/src/com/google/common/collect/HashMultimap.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.Collection; import java.util.Map; import java.util.Set; @@ -151,5 +152,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMultimap(this, stream, distinctKeys); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/HashMultiset.java b/android/guava/src/com/google/common/collect/HashMultiset.java index b6a28a1aae06..e975b9a482fc 100644 --- a/android/guava/src/com/google/common/collect/HashMultiset.java +++ b/android/guava/src/com/google/common/collect/HashMultiset.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import org.jspecify.annotations.Nullable; /** @@ -70,5 +71,5 @@ ObjectCountHashMap newBackingMap(int distinctElements) { return new ObjectCountHashMap<>(distinctElements); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/ImmutableAsList.java b/android/guava/src/com/google/common/collect/ImmutableAsList.java index b94e7f5d26cf..37729afcd62d 100644 --- a/android/guava/src/com/google/common/collect/ImmutableAsList.java +++ b/android/guava/src/com/google/common/collect/ImmutableAsList.java @@ -21,6 +21,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -72,7 +73,7 @@ Object readResolve() { return collection.asList(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @GwtIncompatible // serialization diff --git a/android/guava/src/com/google/common/collect/ImmutableBiMap.java b/android/guava/src/com/google/common/collect/ImmutableBiMap.java index fda807af75ea..d39d24252f67 100644 --- a/android/guava/src/com/google/common/collect/ImmutableBiMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableBiMap.java @@ -26,6 +26,7 @@ import com.google.errorprone.annotations.DoNotCall; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.util.Arrays; import java.util.Collection; import java.util.Comparator; @@ -606,7 +607,7 @@ Builder makeBuilder(int size) { return new Builder<>(size); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @Override @@ -660,5 +661,5 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException throw new UnsupportedOperationException(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xdecaf; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0xdecaf; } diff --git a/android/guava/src/com/google/common/collect/ImmutableCollection.java b/android/guava/src/com/google/common/collect/ImmutableCollection.java index 84a676048a84..c75b8c99b6d9 100644 --- a/android/guava/src/com/google/common/collect/ImmutableCollection.java +++ b/android/guava/src/com/google/common/collect/ImmutableCollection.java @@ -28,6 +28,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractCollection; import java.util.Arrays; @@ -569,5 +570,5 @@ public Builder addAll(Iterable elements) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xdecaf; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0xdecaf; } diff --git a/android/guava/src/com/google/common/collect/ImmutableEntry.java b/android/guava/src/com/google/common/collect/ImmutableEntry.java index 1cc8ac35077d..bf245bbcbf15 100644 --- a/android/guava/src/com/google/common/collect/ImmutableEntry.java +++ b/android/guava/src/com/google/common/collect/ImmutableEntry.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -56,5 +57,5 @@ public final V setValue(@ParametricNullness V value) { throw new UnsupportedOperationException(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/ImmutableEnumMap.java b/android/guava/src/com/google/common/collect/ImmutableEnumMap.java index 769af2d8cd03..1de2c66147b9 100644 --- a/android/guava/src/com/google/common/collect/ImmutableEnumMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableEnumMap.java @@ -25,6 +25,7 @@ import com.google.common.collect.ImmutableMap.IteratorBasedImmutableMap; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.EnumMap; import org.jspecify.annotations.Nullable; @@ -124,6 +125,6 @@ Object readResolve() { return new ImmutableEnumMap<>(delegate); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/android/guava/src/com/google/common/collect/ImmutableEnumSet.java b/android/guava/src/com/google/common/collect/ImmutableEnumSet.java index d8c37fc3efcb..2cd02ada75aa 100644 --- a/android/guava/src/com/google/common/collect/ImmutableEnumSet.java +++ b/android/guava/src/com/google/common/collect/ImmutableEnumSet.java @@ -24,6 +24,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.EnumSet; @@ -152,6 +153,6 @@ Object readResolve() { return new ImmutableEnumSet(delegate.clone()); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/android/guava/src/com/google/common/collect/ImmutableList.java b/android/guava/src/com/google/common/collect/ImmutableList.java index b4a58dc38691..485054986e2a 100644 --- a/android/guava/src/com/google/common/collect/ImmutableList.java +++ b/android/guava/src/com/google/common/collect/ImmutableList.java @@ -33,6 +33,7 @@ import com.google.errorprone.annotations.InlineMe; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -704,7 +705,7 @@ Object readResolve() { return copyOf(elements); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @J2ktIncompatible // serialization @@ -864,5 +865,6 @@ ImmutableList buildSorted(Comparator comparator) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe; + @GwtIncompatible @J2ktIncompatible @Serial + private static final long serialVersionUID = 0xcafebabe; } diff --git a/android/guava/src/com/google/common/collect/ImmutableListMultimap.java b/android/guava/src/com/google/common/collect/ImmutableListMultimap.java index dd17698e4069..8ffe014ea729 100644 --- a/android/guava/src/com/google/common/collect/ImmutableListMultimap.java +++ b/android/guava/src/com/google/common/collect/ImmutableListMultimap.java @@ -30,6 +30,7 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.Collection; import java.util.Comparator; import java.util.Map; @@ -556,5 +557,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo FieldSettersHolder.SIZE_FIELD_SETTER.set(this, tmpSize); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/ImmutableMap.java b/android/guava/src/com/google/common/collect/ImmutableMap.java index 60d46cf1442a..c854cafa135d 100644 --- a/android/guava/src/com/google/common/collect/ImmutableMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableMap.java @@ -34,6 +34,7 @@ import com.google.j2objc.annotations.WeakOuter; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractMap; import java.util.Arrays; @@ -1192,7 +1193,7 @@ Builder makeBuilder(int size) { return new Builder<>(size); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -1210,5 +1211,5 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException throw new InvalidObjectException("Use SerializedForm"); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xdecaf; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0xdecaf; } diff --git a/android/guava/src/com/google/common/collect/ImmutableMapEntrySet.java b/android/guava/src/com/google/common/collect/ImmutableMapEntrySet.java index 3136a414b821..3e3070294174 100644 --- a/android/guava/src/com/google/common/collect/ImmutableMapEntrySet.java +++ b/android/guava/src/com/google/common/collect/ImmutableMapEntrySet.java @@ -21,6 +21,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Map.Entry; import org.jspecify.annotations.Nullable; @@ -138,6 +139,6 @@ Object readResolve() { return map.entrySet(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/android/guava/src/com/google/common/collect/ImmutableMapKeySet.java b/android/guava/src/com/google/common/collect/ImmutableMapKeySet.java index fc22cbb8ac5f..11a201017f25 100644 --- a/android/guava/src/com/google/common/collect/ImmutableMapKeySet.java +++ b/android/guava/src/com/google/common/collect/ImmutableMapKeySet.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -81,6 +82,6 @@ Object readResolve() { return map.keySet(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/android/guava/src/com/google/common/collect/ImmutableMapValues.java b/android/guava/src/com/google/common/collect/ImmutableMapValues.java index 272c4ca77caf..6230f02bdb94 100644 --- a/android/guava/src/com/google/common/collect/ImmutableMapValues.java +++ b/android/guava/src/com/google/common/collect/ImmutableMapValues.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Map.Entry; import org.jspecify.annotations.Nullable; @@ -118,6 +119,6 @@ Object readResolve() { return map.values(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/android/guava/src/com/google/common/collect/ImmutableMultimap.java b/android/guava/src/com/google/common/collect/ImmutableMultimap.java index b50053445439..89039ed51c3e 100644 --- a/android/guava/src/com/google/common/collect/ImmutableMultimap.java +++ b/android/guava/src/com/google/common/collect/ImmutableMultimap.java @@ -35,6 +35,7 @@ import com.google.j2objc.annotations.WeakOuter; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Comparator; @@ -655,7 +656,7 @@ Object writeReplace() { return super.writeReplace(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @Override @@ -845,8 +846,8 @@ Object writeReplace() { return super.writeReplace(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/ImmutableMultiset.java b/android/guava/src/com/google/common/collect/ImmutableMultiset.java index 231f3ecf8dc1..178733c222c3 100644 --- a/android/guava/src/com/google/common/collect/ImmutableMultiset.java +++ b/android/guava/src/com/google/common/collect/ImmutableMultiset.java @@ -28,6 +28,7 @@ import com.google.j2objc.annotations.WeakOuter; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -412,7 +413,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException throw new InvalidObjectException("Use EntrySetSerializedForm"); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @GwtIncompatible @@ -674,5 +675,5 @@ public ImmutableMultiset build() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xdecaf; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0xdecaf; } diff --git a/android/guava/src/com/google/common/collect/ImmutableRangeMap.java b/android/guava/src/com/google/common/collect/ImmutableRangeMap.java index f9cb83557734..2483484cb326 100644 --- a/android/guava/src/com/google/common/collect/ImmutableRangeMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableRangeMap.java @@ -29,6 +29,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.List; import java.util.Map; @@ -431,7 +432,7 @@ Object createRangeMap() { return builder.build(); } - @J2ktIncompatible private static final long serialVersionUID = 0; + @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } Object writeReplace() { @@ -443,5 +444,5 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException throw new InvalidObjectException("Use SerializedForm"); } - @J2ktIncompatible private static final long serialVersionUID = 0; + @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/ImmutableSet.java b/android/guava/src/com/google/common/collect/ImmutableSet.java index 51d434fca57c..7607d98406ea 100644 --- a/android/guava/src/com/google/common/collect/ImmutableSet.java +++ b/android/guava/src/com/google/common/collect/ImmutableSet.java @@ -33,6 +33,7 @@ import com.google.j2objc.annotations.RetainedWith; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -399,7 +400,7 @@ Object readResolve() { return copyOf(elements); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @Override @@ -627,5 +628,5 @@ public ImmutableSet build() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xdecaf; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0xdecaf; } diff --git a/android/guava/src/com/google/common/collect/ImmutableSetMultimap.java b/android/guava/src/com/google/common/collect/ImmutableSetMultimap.java index 8d6c51dc9aea..3668ebd744a4 100644 --- a/android/guava/src/com/google/common/collect/ImmutableSetMultimap.java +++ b/android/guava/src/com/google/common/collect/ImmutableSetMultimap.java @@ -35,6 +35,7 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.Collection; import java.util.Comparator; import java.util.Map; @@ -732,5 +733,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo SetFieldSettersHolder.EMPTY_SET_FIELD_SETTER.set(this, emptySet(valueComparator)); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/ImmutableSortedMap.java b/android/guava/src/com/google/common/collect/ImmutableSortedMap.java index dcee7ced25f3..fddab9d0e487 100644 --- a/android/guava/src/com/google/common/collect/ImmutableSortedMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableSortedMap.java @@ -30,6 +30,7 @@ import com.google.errorprone.annotations.DoNotCall; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.util.AbstractMap; import java.util.Arrays; import java.util.Comparator; @@ -1189,7 +1190,7 @@ Builder makeBuilder(int size) { return new Builder<>(comparator); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @Override @@ -1205,7 +1206,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException // This class is never actually serialized directly, but we have to make the // warning go away (and suppressing would suppress for all nested classes too) - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; /** * Not supported. Use {@link #toImmutableSortedMap}, which offers better type-safety, instead. diff --git a/android/guava/src/com/google/common/collect/ImmutableSortedMultiset.java b/android/guava/src/com/google/common/collect/ImmutableSortedMultiset.java index 9650fd5cc2f6..32138d181585 100644 --- a/android/guava/src/com/google/common/collect/ImmutableSortedMultiset.java +++ b/android/guava/src/com/google/common/collect/ImmutableSortedMultiset.java @@ -26,6 +26,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -906,5 +907,5 @@ public static ImmutableSortedMultiset copyOf(Z[] elements) { throw new UnsupportedOperationException(); } - @J2ktIncompatible private static final long serialVersionUID = 0xdecaf; + @J2ktIncompatible @Serial private static final long serialVersionUID = 0xdecaf; } diff --git a/android/guava/src/com/google/common/collect/ImmutableSortedSet.java b/android/guava/src/com/google/common/collect/ImmutableSortedSet.java index 489d3e6b41c0..41b9f6925f7f 100644 --- a/android/guava/src/com/google/common/collect/ImmutableSortedSet.java +++ b/android/guava/src/com/google/common/collect/ImmutableSortedSet.java @@ -30,6 +30,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -790,7 +791,7 @@ Object readResolve() { return new Builder(comparator).add((E[]) elements).build(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @J2ktIncompatible // serialization @@ -953,5 +954,5 @@ public static ImmutableSortedSet copyOf(Z[] elements) { throw new UnsupportedOperationException(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xdecaf; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0xdecaf; } diff --git a/android/guava/src/com/google/common/collect/ImmutableTable.java b/android/guava/src/com/google/common/collect/ImmutableTable.java index afb16df7bede..ed29a9924fc5 100644 --- a/android/guava/src/com/google/common/collect/ImmutableTable.java +++ b/android/guava/src/com/google/common/collect/ImmutableTable.java @@ -29,6 +29,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; import java.util.Iterator; @@ -493,7 +494,7 @@ Object readResolve() { cellListBuilder.build(), ImmutableSet.copyOf(rowKeys), ImmutableSet.copyOf(columnKeys)); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @J2ktIncompatible // serialization @@ -506,5 +507,5 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException throw new InvalidObjectException("Use SerializedForm"); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xdecaf; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0xdecaf; } diff --git a/android/guava/src/com/google/common/collect/LexicographicalOrdering.java b/android/guava/src/com/google/common/collect/LexicographicalOrdering.java index c899759b15b9..38775803f249 100644 --- a/android/guava/src/com/google/common/collect/LexicographicalOrdering.java +++ b/android/guava/src/com/google/common/collect/LexicographicalOrdering.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; import java.util.Iterator; @@ -75,5 +76,5 @@ public String toString() { return elementOrder + ".lexicographical()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/LinkedHashMultimap.java b/android/guava/src/com/google/common/collect/LinkedHashMultimap.java index bd539a5191ac..8924cbe6c770 100644 --- a/android/guava/src/com/google/common/collect/LinkedHashMultimap.java +++ b/android/guava/src/com/google/common/collect/LinkedHashMultimap.java @@ -30,6 +30,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.Arrays; import java.util.Collection; import java.util.ConcurrentModificationException; @@ -634,5 +635,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo setMap(map); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } diff --git a/android/guava/src/com/google/common/collect/LinkedListMultimap.java b/android/guava/src/com/google/common/collect/LinkedListMultimap.java index 24079faba4b7..bef05ec873ba 100644 --- a/android/guava/src/com/google/common/collect/LinkedListMultimap.java +++ b/android/guava/src/com/google/common/collect/LinkedListMultimap.java @@ -29,6 +29,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractSequentialList; import java.util.Collection; @@ -876,5 +877,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/Lists.java b/android/guava/src/com/google/common/collect/Lists.java index 4840415889ac..eaa4ffb919d7 100644 --- a/android/guava/src/com/google/common/collect/Lists.java +++ b/android/guava/src/com/google/common/collect/Lists.java @@ -35,6 +35,7 @@ import com.google.common.base.Objects; import com.google.common.math.IntMath; import com.google.common.primitives.Ints; +import java.io.Serial; import java.io.Serializable; import java.math.RoundingMode; import java.util.AbstractList; @@ -361,7 +362,7 @@ public E get(int index) { return (index == 0) ? first : rest[index - 1]; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -399,7 +400,7 @@ public E get(int index) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -604,7 +605,7 @@ T transform(@ParametricNullness F from) { }; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -670,7 +671,7 @@ public int size() { return fromList.size(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -1133,7 +1134,8 @@ public ListIterator listIterator(int index) { return backingList.listIterator(index); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial + private static final long serialVersionUID = 0; }; } else { wrapper = @@ -1143,7 +1145,8 @@ public ListIterator listIterator(int index) { return backingList.listIterator(index); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial + private static final long serialVersionUID = 0; }; } return wrapper.subList(fromIndex, toIndex); diff --git a/android/guava/src/com/google/common/collect/MapMakerInternalMap.java b/android/guava/src/com/google/common/collect/MapMakerInternalMap.java index 984c42fbb6b9..049c7535898e 100644 --- a/android/guava/src/com/google/common/collect/MapMakerInternalMap.java +++ b/android/guava/src/com/google/common/collect/MapMakerInternalMap.java @@ -33,6 +33,7 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; @@ -2811,7 +2812,7 @@ public void clear() { // Serialization Support - private static final long serialVersionUID = 5; + @Serial private static final long serialVersionUID = 5; Object writeReplace() { return new SerializationProxy<>( @@ -2834,7 +2835,7 @@ private void readObject(ObjectInputStream in) throws InvalidObjectException { */ abstract static class AbstractSerializationProxy extends ForwardingConcurrentMap implements Serializable { - private static final long serialVersionUID = 3; + @Serial private static final long serialVersionUID = 3; final Strength keyStrength; final Strength valueStrength; @@ -2903,7 +2904,7 @@ void readEntries(ObjectInputStream in) throws IOException, ClassNotFoundExceptio * circular dependency is present, so the proxy must be able to behave as the map itself. */ private static final class SerializationProxy extends AbstractSerializationProxy { - private static final long serialVersionUID = 3; + @Serial private static final long serialVersionUID = 3; SerializationProxy( Strength keyStrength, diff --git a/android/guava/src/com/google/common/collect/Maps.java b/android/guava/src/com/google/common/collect/Maps.java index 0b593bf6a659..af975b3b7e34 100644 --- a/android/guava/src/com/google/common/collect/Maps.java +++ b/android/guava/src/com/google/common/collect/Maps.java @@ -45,6 +45,7 @@ import com.google.j2objc.annotations.RetainedWith; import com.google.j2objc.annotations.Weak; import com.google.j2objc.annotations.WeakOuter; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractCollection; import java.util.AbstractMap; @@ -1618,7 +1619,7 @@ public String toString() { return "Maps.asConverter(" + bimap + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } /** @@ -1712,7 +1713,7 @@ public Set values() { return (result == null) ? values = Collections.unmodifiableSet(delegate.values()) : result; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/android/guava/src/com/google/common/collect/Multimaps.java b/android/guava/src/com/google/common/collect/Multimaps.java index af3f2f4b2507..69f1f11085f9 100644 --- a/android/guava/src/com/google/common/collect/Multimaps.java +++ b/android/guava/src/com/google/common/collect/Multimaps.java @@ -38,6 +38,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractCollection; import java.util.Collection; @@ -291,7 +292,7 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo setMap(map); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -375,7 +376,7 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo setMap(map); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -481,7 +482,7 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo setMap(map); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -573,7 +574,7 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo setMap(map); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -774,7 +775,7 @@ public Collection values() { return result; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static class UnmodifiableListMultimap< @@ -804,7 +805,7 @@ public List replaceValues(@ParametricNullness K key, Iterable va throw new UnsupportedOperationException(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static class UnmodifiableSetMultimap< @@ -843,7 +844,7 @@ public Set replaceValues(@ParametricNullness K key, Iterable val throw new UnsupportedOperationException(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static class UnmodifiableSortedSetMultimap< @@ -878,7 +879,7 @@ public SortedSet replaceValues(@ParametricNullness K key, Iterable left, Range right) { .result(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/RegularContiguousSet.java b/android/guava/src/com/google/common/collect/RegularContiguousSet.java index 26b5ce6e51df..59ef15585a12 100644 --- a/android/guava/src/com/google/common/collect/RegularContiguousSet.java +++ b/android/guava/src/com/google/common/collect/RegularContiguousSet.java @@ -25,6 +25,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import org.jspecify.annotations.Nullable; @@ -268,5 +269,5 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException throw new InvalidObjectException("Use SerializedForm"); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/RegularImmutableMap.java b/android/guava/src/com/google/common/collect/RegularImmutableMap.java index 18b32fd58096..78269f522f2d 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableMap.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableMap.java @@ -25,6 +25,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; +import java.io.Serial; import java.util.AbstractMap; import java.util.Arrays; import java.util.Map.Entry; @@ -587,5 +588,5 @@ Object writeReplace() { // This class is never actually serialized directly, but we have to make the // warning go away (and suppressing would suppress for all nested classes too) - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/RegularImmutableMultiset.java b/android/guava/src/com/google/common/collect/RegularImmutableMultiset.java index 2dba8ffbeb1b..b3dca2f94449 100644 --- a/android/guava/src/com/google/common/collect/RegularImmutableMultiset.java +++ b/android/guava/src/com/google/common/collect/RegularImmutableMultiset.java @@ -21,6 +21,7 @@ import com.google.common.primitives.Ints; import com.google.errorprone.annotations.concurrent.LazyInit; import com.google.j2objc.annotations.WeakOuter; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -136,7 +137,7 @@ Object readResolve() { return builder.build(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @Override diff --git a/android/guava/src/com/google/common/collect/ReverseNaturalOrdering.java b/android/guava/src/com/google/common/collect/ReverseNaturalOrdering.java index f95f7e421305..afaf48a43ae3 100644 --- a/android/guava/src/com/google/common/collect/ReverseNaturalOrdering.java +++ b/android/guava/src/com/google/common/collect/ReverseNaturalOrdering.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Iterator; @@ -99,5 +100,5 @@ public String toString() { private ReverseNaturalOrdering() {} - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/ReverseOrdering.java b/android/guava/src/com/google/common/collect/ReverseOrdering.java index f8883ff1fcb4..3a0addecae41 100644 --- a/android/guava/src/com/google/common/collect/ReverseOrdering.java +++ b/android/guava/src/com/google/common/collect/ReverseOrdering.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Iterator; import org.jspecify.annotations.Nullable; @@ -112,5 +113,5 @@ public String toString() { return forwardOrder + ".reverse()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/Sets.java b/android/guava/src/com/google/common/collect/Sets.java index 0c3f0bb522c3..04807ff0a1e2 100644 --- a/android/guava/src/com/google/common/collect/Sets.java +++ b/android/guava/src/com/google/common/collect/Sets.java @@ -33,6 +33,7 @@ import com.google.errorprone.annotations.DoNotCall; import com.google.errorprone.annotations.InlineMe; import com.google.errorprone.annotations.concurrent.LazyInit; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractSet; import java.util.Arrays; @@ -1905,7 +1906,7 @@ public NavigableSet tailSet(@ParametricNullness E fromElement, boolean inclus return unmodifiableNavigableSet(delegate.tailSet(fromElement, inclusive)); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/android/guava/src/com/google/common/collect/StandardRowSortedTable.java b/android/guava/src/com/google/common/collect/StandardRowSortedTable.java index 2e0550f4ea08..5b899fa155eb 100644 --- a/android/guava/src/com/google/common/collect/StandardRowSortedTable.java +++ b/android/guava/src/com/google/common/collect/StandardRowSortedTable.java @@ -23,6 +23,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Supplier; import com.google.j2objc.annotations.WeakOuter; +import java.io.Serial; import java.util.Comparator; import java.util.Map; import java.util.Set; @@ -142,5 +143,5 @@ public SortedMap> tailMap(R fromKey) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/StandardTable.java b/android/guava/src/com/google/common/collect/StandardTable.java index 49a953799fd7..6956ff0e5faa 100644 --- a/android/guava/src/com/google/common/collect/StandardTable.java +++ b/android/guava/src/com/google/common/collect/StandardTable.java @@ -41,6 +41,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.concurrent.LazyInit; import com.google.j2objc.annotations.WeakOuter; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; @@ -999,5 +1000,5 @@ public boolean retainAll(Collection c) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/Synchronized.java b/android/guava/src/com/google/common/collect/Synchronized.java index be4ed53f647f..e7331951d4fa 100644 --- a/android/guava/src/com/google/common/collect/Synchronized.java +++ b/android/guava/src/com/google/common/collect/Synchronized.java @@ -26,6 +26,7 @@ import com.google.j2objc.annotations.RetainedWith; import java.io.IOException; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Comparator; @@ -104,7 +105,7 @@ private void writeObject(ObjectOutputStream stream) throws IOException { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static Collection collection( @@ -215,7 +216,7 @@ public int size() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @VisibleForTesting @@ -252,7 +253,7 @@ public int hashCode() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static SortedSet sortedSet( @@ -313,7 +314,7 @@ public E last() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static List list(List list, @Nullable Object mutex) { @@ -416,7 +417,7 @@ public int hashCode() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static final class SynchronizedRandomAccessList @@ -425,7 +426,7 @@ static final class SynchronizedRandomAccessList super(list, mutex); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static Multiset multiset( @@ -522,7 +523,7 @@ public int hashCode() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static Multimap multimap( @@ -709,7 +710,7 @@ public int hashCode() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static ListMultimap listMultimap( @@ -753,7 +754,7 @@ public List replaceValues(K key, Iterable values) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static SetMultimap setMultimap( @@ -808,7 +809,7 @@ public Set> entries() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static @@ -860,7 +861,7 @@ public SortedSet replaceValues(K key, Iterable values) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static Collection typePreservingCollection( @@ -983,7 +984,7 @@ public boolean retainAll(Collection c) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @VisibleForTesting @@ -1118,7 +1119,7 @@ public int hashCode() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static SortedMap sortedMap( @@ -1180,7 +1181,7 @@ public SortedMap tailMap(K fromKey) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static BiMap biMap( @@ -1234,7 +1235,7 @@ public BiMap inverse() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static final class SynchronizedAsMap @@ -1280,7 +1281,7 @@ public boolean containsValue(@Nullable Object o) { return values().contains(o); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static final class SynchronizedAsMapValues @@ -1300,7 +1301,7 @@ Collection transform(Collection from) { }; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @GwtIncompatible // NavigableSet @@ -1415,7 +1416,7 @@ public SortedSet tailSet(E fromElement) { return tailSet(fromElement, true); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @GwtIncompatible // NavigableSet @@ -1618,7 +1619,7 @@ public SortedMap tailMap(K fromKey) { return tailMap(fromKey, true); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @GwtIncompatible // works but is needed only for NavigableMap @@ -1680,7 +1681,7 @@ public V setValue(V value) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static Queue queue(Queue queue, @Nullable Object mutex) { @@ -1734,7 +1735,7 @@ public E remove() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static Deque deque(Deque deque, @Nullable Object mutex) { @@ -1872,7 +1873,7 @@ public Iterator descendingIterator() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static diff --git a/android/guava/src/com/google/common/collect/Tables.java b/android/guava/src/com/google/common/collect/Tables.java index ae60fddc34e6..d654cf13061b 100644 --- a/android/guava/src/com/google/common/collect/Tables.java +++ b/android/guava/src/com/google/common/collect/Tables.java @@ -29,6 +29,7 @@ import com.google.common.base.Objects; import com.google.common.base.Supplier; import com.google.common.collect.Table.Cell; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Collections; @@ -167,7 +168,7 @@ public V getValue() { return value; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } abstract static class AbstractCell< @@ -608,7 +609,7 @@ public Collection values() { return Collections.unmodifiableCollection(super.values()); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -658,7 +659,7 @@ public SortedSet rowKeySet() { return Collections.unmodifiableSortedSet(delegate().rowKeySet()); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/android/guava/src/com/google/common/collect/TreeBasedTable.java b/android/guava/src/com/google/common/collect/TreeBasedTable.java index 5bbc39351aba..1f674c795765 100644 --- a/android/guava/src/com/google/common/collect/TreeBasedTable.java +++ b/android/guava/src/com/google/common/collect/TreeBasedTable.java @@ -27,6 +27,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Supplier; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; import java.util.Iterator; @@ -86,7 +87,7 @@ public Map get() { return new TreeMap<>(comparator); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -335,5 +336,5 @@ Iterator createColumnKeyIterator() { }; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/TreeMultimap.java b/android/guava/src/com/google/common/collect/TreeMultimap.java index 11509a091368..529af9383e43 100644 --- a/android/guava/src/com/google/common/collect/TreeMultimap.java +++ b/android/guava/src/com/google/common/collect/TreeMultimap.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.Collection; import java.util.Comparator; import java.util.Map; @@ -225,5 +226,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMultimap(this, stream); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/TreeMultiset.java b/android/guava/src/com/google/common/collect/TreeMultiset.java index b8f28b44fc22..ad11b2bb7db0 100644 --- a/android/guava/src/com/google/common/collect/TreeMultiset.java +++ b/android/guava/src/com/google/common/collect/TreeMultiset.java @@ -32,6 +32,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; import java.util.ConcurrentModificationException; @@ -1079,5 +1080,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMultiset(this, stream); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } diff --git a/android/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java b/android/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java index 0b602c1d0eb2..50b44708065c 100644 --- a/android/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java +++ b/android/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java @@ -23,6 +23,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.collect.Multisets.UnmodifiableMultiset; import com.google.errorprone.annotations.concurrent.LazyInit; +import java.io.Serial; import java.util.Comparator; import java.util.NavigableSet; import org.jspecify.annotations.Nullable; @@ -114,5 +115,5 @@ public SortedMultiset tailMultiset(@ParametricNullness E lowerBound, BoundTyp return Multisets.unmodifiableSortedMultiset(delegate().tailMultiset(lowerBound, boundType)); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/collect/UsingToStringOrdering.java b/android/guava/src/com/google/common/collect/UsingToStringOrdering.java index 7839aff833c2..b3f6b42e62a2 100644 --- a/android/guava/src/com/google/common/collect/UsingToStringOrdering.java +++ b/android/guava/src/com/google/common/collect/UsingToStringOrdering.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; /** An ordering that uses the natural order of the string representation of the values. */ @@ -43,5 +44,5 @@ public String toString() { private UsingToStringOrdering() {} - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/hash/AbstractCompositeHashFunction.java b/android/guava/src/com/google/common/hash/AbstractCompositeHashFunction.java index 15ce417441df..a816101778ca 100644 --- a/android/guava/src/com/google/common/hash/AbstractCompositeHashFunction.java +++ b/android/guava/src/com/google/common/hash/AbstractCompositeHashFunction.java @@ -18,6 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.errorprone.annotations.Immutable; +import java.io.Serial; import java.nio.ByteBuffer; import java.nio.charset.Charset; import org.jspecify.annotations.Nullable; @@ -193,5 +194,5 @@ public HashCode hash() { }; } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/android/guava/src/com/google/common/hash/BloomFilter.java b/android/guava/src/com/google/common/hash/BloomFilter.java index 22d20dd0e1db..feb62d8189f0 100644 --- a/android/guava/src/com/google/common/hash/BloomFilter.java +++ b/android/guava/src/com/google/common/hash/BloomFilter.java @@ -36,6 +36,7 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.OutputStream; +import java.io.Serial; import java.io.Serializable; import java.math.RoundingMode; import java.util.stream.Collector; @@ -570,7 +571,7 @@ Object readResolve() { return new BloomFilter(new LockFreeBitArray(data), numHashFunctions, funnel, strategy); } - private static final long serialVersionUID = 1; + @Serial private static final long serialVersionUID = 1; } /** @@ -651,5 +652,5 @@ public void writeTo(OutputStream out) throws IOException { } } - private static final long serialVersionUID = 0xdecaf; + @Serial private static final long serialVersionUID = 0xdecaf; } diff --git a/android/guava/src/com/google/common/hash/ChecksumHashFunction.java b/android/guava/src/com/google/common/hash/ChecksumHashFunction.java index 380c3a39ab6e..4aaf7f736e1e 100644 --- a/android/guava/src/com/google/common/hash/ChecksumHashFunction.java +++ b/android/guava/src/com/google/common/hash/ChecksumHashFunction.java @@ -18,6 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.errorprone.annotations.Immutable; +import java.io.Serial; import java.io.Serializable; import java.util.zip.Checksum; @@ -89,5 +90,5 @@ public HashCode hash() { } } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/android/guava/src/com/google/common/hash/Funnels.java b/android/guava/src/com/google/common/hash/Funnels.java index 2557e9c2bb80..8cdace3d49b9 100644 --- a/android/guava/src/com/google/common/hash/Funnels.java +++ b/android/guava/src/com/google/common/hash/Funnels.java @@ -19,6 +19,7 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.OutputStream; +import java.io.Serial; import java.io.Serializable; import java.nio.charset.Charset; import org.jspecify.annotations.Nullable; @@ -137,7 +138,7 @@ private Object readResolve() { return stringFunnel(Charset.forName(charsetCanonicalName)); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } } diff --git a/android/guava/src/com/google/common/hash/HashCode.java b/android/guava/src/com/google/common/hash/HashCode.java index 6d5d9adc5565..560e41942ef9 100644 --- a/android/guava/src/com/google/common/hash/HashCode.java +++ b/android/guava/src/com/google/common/hash/HashCode.java @@ -22,6 +22,7 @@ import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedInts; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -159,7 +160,7 @@ boolean equalsSameBits(HashCode that) { return hash == that.asInt(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } /** @@ -225,7 +226,7 @@ boolean equalsSameBits(HashCode that) { return hash == that.asLong(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } /** @@ -319,7 +320,7 @@ boolean equalsSameBits(HashCode that) { return areEqual; } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } /** diff --git a/android/guava/src/com/google/common/hash/LongAdder.java b/android/guava/src/com/google/common/hash/LongAdder.java index 70ef21bc4e09..e397cab3168e 100644 --- a/android/guava/src/com/google/common/hash/LongAdder.java +++ b/android/guava/src/com/google/common/hash/LongAdder.java @@ -16,6 +16,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.concurrent.atomic.AtomicLong; @@ -41,7 +42,7 @@ * @author Doug Lea */ final class LongAdder extends Striped64 implements Serializable, LongAddable { - @GwtIncompatible @J2ktIncompatible + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 7249069246863182397L; /** Version of plus for use in retryUpdate */ diff --git a/android/guava/src/com/google/common/hash/MessageDigestHashFunction.java b/android/guava/src/com/google/common/hash/MessageDigestHashFunction.java index 9a435b9edc13..e8c0b7c33bd6 100644 --- a/android/guava/src/com/google/common/hash/MessageDigestHashFunction.java +++ b/android/guava/src/com/google/common/hash/MessageDigestHashFunction.java @@ -21,6 +21,7 @@ import com.google.errorprone.annotations.Immutable; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.nio.ByteBuffer; import java.security.MessageDigest; @@ -114,7 +115,7 @@ private Object readResolve() { return new MessageDigestHashFunction(algorithmName, bytes, toString); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } Object writeReplace() { diff --git a/android/guava/src/com/google/common/hash/Murmur3_128HashFunction.java b/android/guava/src/com/google/common/hash/Murmur3_128HashFunction.java index 3ce78e8614c6..01ce2c58d395 100644 --- a/android/guava/src/com/google/common/hash/Murmur3_128HashFunction.java +++ b/android/guava/src/com/google/common/hash/Murmur3_128HashFunction.java @@ -28,6 +28,7 @@ import static com.google.common.primitives.UnsignedBytes.toInt; import com.google.errorprone.annotations.Immutable; +import java.io.Serial; import java.io.Serializable; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -212,5 +213,5 @@ private static long mixK2(long k2) { } } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/android/guava/src/com/google/common/hash/Murmur3_32HashFunction.java b/android/guava/src/com/google/common/hash/Murmur3_32HashFunction.java index b04dd22f0b07..38ce10a94091 100644 --- a/android/guava/src/com/google/common/hash/Murmur3_32HashFunction.java +++ b/android/guava/src/com/google/common/hash/Murmur3_32HashFunction.java @@ -35,6 +35,7 @@ import com.google.common.primitives.Longs; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.Immutable; +import java.io.Serial; import java.io.Serializable; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -424,5 +425,5 @@ private static long charToTwoUtf8Bytes(char c) { return ((0x3L << 6) | (c >>> 6)) | ((0x80 | (0x3F & c)) << 8); } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/android/guava/src/com/google/common/hash/SipHashFunction.java b/android/guava/src/com/google/common/hash/SipHashFunction.java index a5f328c3f3fc..0f10ed272cde 100644 --- a/android/guava/src/com/google/common/hash/SipHashFunction.java +++ b/android/guava/src/com/google/common/hash/SipHashFunction.java @@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.errorprone.annotations.Immutable; +import java.io.Serial; import java.io.Serializable; import java.nio.ByteBuffer; import org.jspecify.annotations.Nullable; @@ -180,5 +181,5 @@ private void sipRound(int iterations) { } } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/android/guava/src/com/google/common/math/PairedStats.java b/android/guava/src/com/google/common/math/PairedStats.java index 5985f8498651..9672c8c7cc28 100644 --- a/android/guava/src/com/google/common/math/PairedStats.java +++ b/android/guava/src/com/google/common/math/PairedStats.java @@ -25,6 +25,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import java.io.Serial; import java.io.Serializable; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -315,5 +316,5 @@ public static PairedStats fromByteArray(byte[] byteArray) { return new PairedStats(xStats, yStats, sumOfProductsOfDeltas); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/math/Stats.java b/android/guava/src/com/google/common/math/Stats.java index f902ba777048..3f2def24d7e0 100644 --- a/android/guava/src/com/google/common/math/Stats.java +++ b/android/guava/src/com/google/common/math/Stats.java @@ -28,6 +28,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import java.io.Serial; import java.io.Serializable; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -667,5 +668,5 @@ static Stats readFrom(ByteBuffer buffer) { buffer.getDouble()); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/net/HostAndPort.java b/android/guava/src/com/google/common/net/HostAndPort.java index 78b1a392ee38..2fb3eb3ced9d 100644 --- a/android/guava/src/com/google/common/net/HostAndPort.java +++ b/android/guava/src/com/google/common/net/HostAndPort.java @@ -26,6 +26,7 @@ import com.google.common.base.Strings; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.Immutable; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -319,5 +320,5 @@ private static boolean isValidPort(int port) { return port >= 0 && port <= 65535; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/primitives/Booleans.java b/android/guava/src/com/google/common/primitives/Booleans.java index 211936da04f0..b225ae4e691f 100644 --- a/android/guava/src/com/google/common/primitives/Booleans.java +++ b/android/guava/src/com/google/common/primitives/Booleans.java @@ -24,6 +24,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -514,7 +515,7 @@ boolean[] toBooleanArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/android/guava/src/com/google/common/primitives/Bytes.java b/android/guava/src/com/google/common/primitives/Bytes.java index e9ececf2c8a4..766454b99418 100644 --- a/android/guava/src/com/google/common/primitives/Bytes.java +++ b/android/guava/src/com/google/common/primitives/Bytes.java @@ -22,6 +22,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -376,7 +377,7 @@ byte[] toByteArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/android/guava/src/com/google/common/primitives/Chars.java b/android/guava/src/com/google/common/primitives/Chars.java index b728466c9b8c..a82511aa026f 100644 --- a/android/guava/src/com/google/common/primitives/Chars.java +++ b/android/guava/src/com/google/common/primitives/Chars.java @@ -23,6 +23,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -696,6 +697,6 @@ char[] toCharArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/android/guava/src/com/google/common/primitives/Doubles.java b/android/guava/src/com/google/common/primitives/Doubles.java index 828db51f07b4..a3a691a8920c 100644 --- a/android/guava/src/com/google/common/primitives/Doubles.java +++ b/android/guava/src/com/google/common/primitives/Doubles.java @@ -27,6 +27,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Converter; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -323,7 +324,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } /** @@ -723,7 +724,7 @@ public String toString() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/android/guava/src/com/google/common/primitives/Floats.java b/android/guava/src/com/google/common/primitives/Floats.java index ad7d83101cbd..0539793ecfbe 100644 --- a/android/guava/src/com/google/common/primitives/Floats.java +++ b/android/guava/src/com/google/common/primitives/Floats.java @@ -27,6 +27,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Converter; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -318,7 +319,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } /** @@ -703,7 +704,7 @@ float[] toFloatArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/android/guava/src/com/google/common/primitives/Ints.java b/android/guava/src/com/google/common/primitives/Ints.java index e5a4d7155d35..030816bccfed 100644 --- a/android/guava/src/com/google/common/primitives/Ints.java +++ b/android/guava/src/com/google/common/primitives/Ints.java @@ -24,6 +24,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Converter; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -375,7 +376,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } /** @@ -793,7 +794,7 @@ int[] toIntArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/android/guava/src/com/google/common/primitives/Longs.java b/android/guava/src/com/google/common/primitives/Longs.java index be7c9165fc5c..598e4a8b55c0 100644 --- a/android/guava/src/com/google/common/primitives/Longs.java +++ b/android/guava/src/com/google/common/primitives/Longs.java @@ -24,6 +24,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Converter; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -465,7 +466,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } /** @@ -856,6 +857,6 @@ long[] toLongArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/android/guava/src/com/google/common/primitives/Shorts.java b/android/guava/src/com/google/common/primitives/Shorts.java index 9af7d3918e96..7d3901fed2f2 100644 --- a/android/guava/src/com/google/common/primitives/Shorts.java +++ b/android/guava/src/com/google/common/primitives/Shorts.java @@ -24,6 +24,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Converter; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -368,7 +369,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } /** @@ -746,6 +747,6 @@ short[] toShortArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/android/guava/src/com/google/common/reflect/TypeToken.java b/android/guava/src/com/google/common/reflect/TypeToken.java index 77d613eb66f9..8f2ed0bcc1c2 100644 --- a/android/guava/src/com/google/common/reflect/TypeToken.java +++ b/android/guava/src/com/google/common/reflect/TypeToken.java @@ -33,6 +33,7 @@ import com.google.common.primitives.Primitives; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.concurrent.LazyInit; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Constructor; import java.lang.reflect.GenericArrayType; @@ -708,7 +709,7 @@ public Set> rawTypes() { return ImmutableSet.copyOf(collectedTypes); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } private final class InterfaceSet extends TypeSet { @@ -754,7 +755,7 @@ private Object readResolve() { return getTypes().interfaces(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } private final class ClassSet extends TypeSet { @@ -801,7 +802,7 @@ private Object readResolve() { return getTypes().classes(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } private enum TypeFilter implements Predicate> { @@ -1306,7 +1307,7 @@ private static final class SimpleTypeToken extends TypeToken { super(type); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } /** @@ -1459,5 +1460,5 @@ Iterable getInterfaces(K type) { // This happens to be the hash of the class as of now. So setting it makes a backward compatible // change. Going forward, if any incompatible change is added, we can change the UID back to 1. - private static final long serialVersionUID = 3637540370352322684L; + @Serial private static final long serialVersionUID = 3637540370352322684L; } diff --git a/android/guava/src/com/google/common/reflect/Types.java b/android/guava/src/com/google/common/reflect/Types.java index 0e9885168472..f13923ad647f 100644 --- a/android/guava/src/com/google/common/reflect/Types.java +++ b/android/guava/src/com/google/common/reflect/Types.java @@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Array; @@ -244,7 +245,7 @@ public boolean equals(@Nullable Object obj) { return false; } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } private static final class ParameterizedTypeImpl implements ParameterizedType, Serializable { @@ -309,7 +310,7 @@ public boolean equals(@Nullable Object other) { && Arrays.equals(getActualTypeArguments(), that.getActualTypeArguments()); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } private static TypeVariable newTypeVariableImpl( @@ -506,7 +507,7 @@ public String toString() { return builder.toString(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } private static Type[] toArray(Collection types) { diff --git a/android/guava/src/com/google/common/util/concurrent/AtomicDouble.java b/android/guava/src/com/google/common/util/concurrent/AtomicDouble.java index 8a21b220a5e7..cb87acf419e8 100644 --- a/android/guava/src/com/google/common/util/concurrent/AtomicDouble.java +++ b/android/guava/src/com/google/common/util/concurrent/AtomicDouble.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.concurrent.atomic.AtomicLong; /** @@ -53,7 +54,7 @@ * @since 11.0 */ public class AtomicDouble extends Number { - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; // We would use AtomicLongFieldUpdater, but it has issues on some Android devices. private transient AtomicLong value; diff --git a/android/guava/src/com/google/common/util/concurrent/AtomicDoubleArray.java b/android/guava/src/com/google/common/util/concurrent/AtomicDoubleArray.java index 0ccfcf9f2be4..4b5d9a53a3d7 100644 --- a/android/guava/src/com/google/common/util/concurrent/AtomicDoubleArray.java +++ b/android/guava/src/com/google/common/util/concurrent/AtomicDoubleArray.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.concurrent.atomic.AtomicLongArray; @@ -51,7 +52,7 @@ @GwtIncompatible @J2ktIncompatible public class AtomicDoubleArray implements Serializable { - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; // Making this non-final is the lesser evil according to Effective // Java 2nd Edition Item 76: Write readObject methods defensively. diff --git a/android/guava/src/com/google/common/util/concurrent/ExecutionError.java b/android/guava/src/com/google/common/util/concurrent/ExecutionError.java index 48c20bf81eab..6e870185270d 100644 --- a/android/guava/src/com/google/common/util/concurrent/ExecutionError.java +++ b/android/guava/src/com/google/common/util/concurrent/ExecutionError.java @@ -17,6 +17,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import org.jspecify.annotations.Nullable; /** @@ -86,5 +87,5 @@ public ExecutionError(@Nullable Error cause) { super(cause); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java b/android/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java index 93424486c0d5..3dba140bedfd 100644 --- a/android/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java +++ b/android/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java @@ -17,6 +17,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import org.jspecify.annotations.Nullable; /** @@ -91,5 +92,5 @@ public UncheckedExecutionException(@Nullable Throwable cause) { super(cause); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/android/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java b/android/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java index 375b712028ee..3ace798412ef 100644 --- a/android/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java +++ b/android/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java @@ -16,6 +16,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import org.jspecify.annotations.Nullable; /** @@ -41,5 +42,5 @@ public UncheckedTimeoutException(@Nullable String message, @Nullable Throwable c super(message, cause); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/UnmodifiableSortedMultiset.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/UnmodifiableSortedMultiset.java index bd42afc2eaa4..4fad3a3b4f6f 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/UnmodifiableSortedMultiset.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/UnmodifiableSortedMultiset.java @@ -18,6 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.collect.Multisets.UnmodifiableMultiset; +import java.io.Serial; import java.util.Collections; import java.util.Comparator; import java.util.SortedSet; @@ -104,5 +105,5 @@ public SortedMultiset tailMultiset(E lowerBound, BoundType boundType) { return Multisets.unmodifiableSortedMultiset(delegate().tailMultiset(lowerBound, boundType)); } - @GwtIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java b/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java index 0adac810d74b..bf19ef39a21b 100644 --- a/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/AbstractIteratorTester.java @@ -28,6 +28,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -110,7 +111,7 @@ void assertPermitted(Exception exception) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static final class UnknownElementException extends RuntimeException { @@ -118,7 +119,7 @@ private UnknownElementException(Collection expected, Object actual) { super("Returned value '" + actual + "' not found. Remaining elements: " + expected); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java b/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java index 13e1b9e032cf..06f8ad5f426c 100644 --- a/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java +++ b/guava-testlib/src/com/google/common/collect/testing/BaseComparable.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -56,5 +57,5 @@ public int compareTo(BaseComparable o) { return s.compareTo(o.s); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava-testlib/src/com/google/common/collect/testing/DerivedComparable.java b/guava-testlib/src/com/google/common/collect/testing/DerivedComparable.java index fd9ba97da9b9..df536a685db8 100644 --- a/guava-testlib/src/com/google/common/collect/testing/DerivedComparable.java +++ b/guava-testlib/src/com/google/common/collect/testing/DerivedComparable.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; /** * Simple derived class to verify that we handle generics correctly. @@ -31,5 +32,5 @@ public DerivedComparable(String s) { super(s); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java b/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java index b9fc32b941d9..275100ad1e3e 100644 --- a/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java +++ b/guava-testlib/src/com/google/common/collect/testing/SafeTreeMap.java @@ -18,6 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractSet; import java.util.Collection; @@ -325,5 +326,5 @@ public String toString() { return delegate.toString(); } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java b/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java index cbb8b1421aab..d80fa780174c 100644 --- a/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java +++ b/guava-testlib/src/com/google/common/collect/testing/SafeTreeSet.java @@ -18,6 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Comparator; @@ -253,5 +254,5 @@ public String toString() { return delegate.toString(); } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/guava-testlib/src/com/google/common/collect/testing/features/ConflictingRequirementsException.java b/guava-testlib/src/com/google/common/collect/testing/features/ConflictingRequirementsException.java index 3a37dfdd1e67..a588cab1e3ce 100644 --- a/guava-testlib/src/com/google/common/collect/testing/features/ConflictingRequirementsException.java +++ b/guava-testlib/src/com/google/common/collect/testing/features/ConflictingRequirementsException.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.Set; /** @@ -51,5 +52,5 @@ public String getMessage() { return super.getMessage() + " (source: " + source + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java b/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java index 6b848afa4586..91178bc41f36 100644 --- a/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java +++ b/guava-testlib/src/com/google/common/collect/testing/features/TesterRequirements.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.Collections; import java.util.Set; import org.jspecify.annotations.Nullable; @@ -80,5 +81,5 @@ public String toString() { return "{TesterRequirements: present=" + presentFeatures + ", absent=" + absentFeatures + "}"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava-testlib/src/com/google/common/collect/testing/google/BiMapInverseTester.java b/guava-testlib/src/com/google/common/collect/testing/google/BiMapInverseTester.java index b8f372854489..3389801722a1 100644 --- a/guava-testlib/src/com/google/common/collect/testing/google/BiMapInverseTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/google/BiMapInverseTester.java @@ -25,6 +25,7 @@ import com.google.common.collect.testing.Helpers; import com.google.common.collect.testing.features.CollectionFeature; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Method; import java.util.Collections; @@ -68,7 +69,7 @@ private static class BiMapPair implements Serializable { this.backward = original.inverse(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/guava-testlib/test/com/google/common/testing/NullPointerTesterTest.java b/guava-testlib/test/com/google/common/testing/NullPointerTesterTest.java index 0998cbc5e8db..e3dce6f4e6aa 100644 --- a/guava-testlib/test/com/google/common/testing/NullPointerTesterTest.java +++ b/guava-testlib/test/com/google/common/testing/NullPointerTesterTest.java @@ -39,6 +39,7 @@ import com.google.common.testing.NullPointerTester.Visibility; import com.google.common.testing.anotherpackage.SomeClassThatDoesNotUseNullable; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.List; @@ -66,7 +67,7 @@ public class NullPointerTesterTest extends TestCase { /** Non-NPE RuntimeException. */ public static class FooException extends RuntimeException { - private static final long serialVersionUID = 1L; + @Serial private static final long serialVersionUID = 1L; } /** diff --git a/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java b/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java index 67f11de2e6ed..fe1137cee40d 100644 --- a/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java +++ b/guava-testlib/test/com/google/common/testing/SerializableTesterTest.java @@ -16,6 +16,7 @@ package com.google.common.testing; +import java.io.Serial; import java.io.Serializable; import junit.framework.AssertionFailedError; import junit.framework.TestCase; @@ -77,11 +78,11 @@ public void testObjectWhichIsEqualButChangesClass() { } private static class ClassWhichDoesNotImplementEquals implements Serializable { - private static final long serialVersionUID = 1L; + @Serial private static final long serialVersionUID = 1L; } private static class ClassWhichIsAlwaysEqualButHasDifferentHashcodes implements Serializable { - private static final long serialVersionUID = 2L; + @Serial private static final long serialVersionUID = 2L; @SuppressWarnings("EqualsHashCode") @Override @@ -91,7 +92,7 @@ public boolean equals(@Nullable Object other) { } private static class ObjectWhichIsEqualButChangesClass implements Serializable { - private static final long serialVersionUID = 1L; + @Serial private static final long serialVersionUID = 1L; @Override public boolean equals(@Nullable Object other) { diff --git a/guava-tests/test/com/google/common/base/FunctionsTest.java b/guava-tests/test/com/google/common/base/FunctionsTest.java index 947f798ac56a..61aa362801fc 100644 --- a/guava-tests/test/com/google/common/base/FunctionsTest.java +++ b/guava-tests/test/com/google/common/base/FunctionsTest.java @@ -27,6 +27,7 @@ import com.google.common.testing.EqualsTester; import com.google.common.testing.NullPointerTester; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.Map; import junit.framework.TestCase; @@ -368,7 +369,7 @@ public void testConstantSerializable() { private static class CountingSupplier implements Supplier, Serializable { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; private int value; diff --git a/guava-tests/test/com/google/common/base/PredicatesTest.java b/guava-tests/test/com/google/common/base/PredicatesTest.java index 1b53326958f5..0ad9ab165ad9 100644 --- a/guava-tests/test/com/google/common/base/PredicatesTest.java +++ b/guava-tests/test/com/google/common/base/PredicatesTest.java @@ -28,6 +28,7 @@ import com.google.common.testing.EqualsTester; import com.google.common.testing.NullPointerTester; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -61,7 +62,8 @@ 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 @Serial + private static final long serialVersionUID = 0x150ddL; @Override public boolean apply(@Nullable Integer i) { @@ -718,7 +720,7 @@ public void testIn_serialization() { public void testIn_handlesNullPointerException() { class CollectionThatThrowsNullPointerException extends ArrayList { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1L; @Override public boolean contains(@Nullable Object element) { @@ -733,7 +735,7 @@ public boolean contains(@Nullable Object element) { public void testIn_handlesClassCastException() { class CollectionThatThrowsClassCastException extends ArrayList { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1L; @Override public boolean contains(@Nullable Object element) { diff --git a/guava-tests/test/com/google/common/base/SuppliersTest.java b/guava-tests/test/com/google/common/base/SuppliersTest.java index 4a6c68bee726..94d665dbca6a 100644 --- a/guava-tests/test/com/google/common/base/SuppliersTest.java +++ b/guava-tests/test/com/google/common/base/SuppliersTest.java @@ -30,6 +30,7 @@ import com.google.common.testing.ClassSanityTester; import com.google.common.testing.EqualsTester; import java.io.NotSerializableException; +import java.io.Serial; import java.io.Serializable; import java.time.Duration; import java.util.ArrayList; @@ -74,11 +75,11 @@ public Integer get() { } static class SerializableCountingSupplier extends CountingSupplier implements Serializable { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } static class SerializableThrowingSupplier extends ThrowingSupplier implements Serializable { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } static void checkMemoize(CountingSupplier countingSupplier, Supplier memoizedSupplier) { diff --git a/guava-tests/test/com/google/common/collect/Base.java b/guava-tests/test/com/google/common/collect/Base.java index 1d9e2836202e..1a0576a6e0bb 100644 --- a/guava-tests/test/com/google/common/collect/Base.java +++ b/guava-tests/test/com/google/common/collect/Base.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.NullUnmarked; import org.jspecify.annotations.Nullable; @@ -54,5 +55,5 @@ public int compareTo(Base o) { return s.compareTo(o.s); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava-tests/test/com/google/common/collect/Derived.java b/guava-tests/test/com/google/common/collect/Derived.java index 046853509f6b..dd6ea6aed250 100644 --- a/guava-tests/test/com/google/common/collect/Derived.java +++ b/guava-tests/test/com/google/common/collect/Derived.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import org.jspecify.annotations.NullUnmarked; /** Simple derived class to verify that we handle generics correctly. */ @@ -29,5 +30,5 @@ public Derived(String s) { super(s); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava-tests/test/com/google/common/collect/HashMultisetTest.java b/guava-tests/test/com/google/common/collect/HashMultisetTest.java index f978ebb4d321..de2ac55ae4a1 100644 --- a/guava-tests/test/com/google/common/collect/HashMultisetTest.java +++ b/guava-tests/test/com/google/common/collect/HashMultisetTest.java @@ -27,6 +27,7 @@ import com.google.common.collect.testing.google.MultisetTestSuiteBuilder; import com.google.common.collect.testing.google.TestStringMultisetGenerator; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import junit.framework.Test; import junit.framework.TestCase; @@ -115,7 +116,7 @@ private static class MultisetHolder implements Serializable { this.member = multiset; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1L; } @J2ktIncompatible diff --git a/guava-tests/test/com/google/common/collect/ImmutableMapTest.java b/guava-tests/test/com/google/common/collect/ImmutableMapTest.java index fa114553fec2..05bd28af3b3f 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableMapTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableMapTest.java @@ -53,6 +53,7 @@ import com.google.common.testing.NullPointerTester; import java.io.ByteArrayOutputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractMap; import java.util.Collection; @@ -888,7 +889,7 @@ public int hashCode() { return value; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 5; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 5; } public void testMutableValues() { diff --git a/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java b/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java index c5bd036bc2f2..01a4a4a2890a 100644 --- a/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java +++ b/guava-tests/test/com/google/common/collect/ImmutableSortedMapTest.java @@ -43,6 +43,7 @@ import com.google.common.testing.CollectorTester; import com.google.common.testing.NullPointerTester; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.Collections; import java.util.Comparator; @@ -705,7 +706,7 @@ public int hashCode() { return value; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 5; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 5; } public void testMutableValues() { diff --git a/guava-tests/test/com/google/common/collect/LegacyComparable.java b/guava-tests/test/com/google/common/collect/LegacyComparable.java index 941471b7a2f3..d30b82514d33 100644 --- a/guava-tests/test/com/google/common/collect/LegacyComparable.java +++ b/guava-tests/test/com/google/common/collect/LegacyComparable.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.NullMarked; import org.jspecify.annotations.Nullable; @@ -70,5 +71,5 @@ public int hashCode() { return value.hashCode(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava-tests/test/com/google/common/collect/ListsTest.java b/guava-tests/test/com/google/common/collect/ListsTest.java index 69e0440801f2..55da17b0b147 100644 --- a/guava-tests/test/com/google/common/collect/ListsTest.java +++ b/guava-tests/test/com/google/common/collect/ListsTest.java @@ -48,6 +48,7 @@ import com.google.common.collect.testing.google.ListGenerators.CharactersOfStringGenerator; import com.google.common.testing.NullPointerTester; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; @@ -91,7 +92,7 @@ public Iterator iterator() { return SOME_COLLECTION.iterator(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static final List SOME_LIST = Lists.newArrayList(1, 2, 3, 4); @@ -108,7 +109,7 @@ public String apply(Number n) { return String.valueOf(n); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @J2ktIncompatible diff --git a/guava-tests/test/com/google/common/collect/LockHeldAssertingSet.java b/guava-tests/test/com/google/common/collect/LockHeldAssertingSet.java index 09ebb271d424..5570d4ba2144 100644 --- a/guava-tests/test/com/google/common/collect/LockHeldAssertingSet.java +++ b/guava-tests/test/com/google/common/collect/LockHeldAssertingSet.java @@ -19,6 +19,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static junit.framework.Assert.assertTrue; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Set; @@ -164,5 +165,5 @@ public T[] toArray(T[] a) { return super.toArray(a); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } diff --git a/guava-tests/test/com/google/common/collect/MultimapsTest.java b/guava-tests/test/com/google/common/collect/MultimapsTest.java index ae62dd98bb48..450e1011f1a7 100644 --- a/guava-tests/test/com/google/common/collect/MultimapsTest.java +++ b/guava-tests/test/com/google/common/collect/MultimapsTest.java @@ -53,6 +53,7 @@ import com.google.common.testing.EqualsTester; import com.google.common.testing.NullPointerTester; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -623,7 +624,7 @@ public Queue getImpl() { return new LinkedList<>(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } public void testNewMultimapWithCollectionRejectingNegativeElements() { @@ -717,7 +718,7 @@ public LinkedList getImpl() { return new LinkedList<>(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } public void testNewListMultimap() { @@ -753,7 +754,7 @@ public Set getImpl() { return new HashSet<>(4); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } public void testNewSetMultimap() { @@ -785,7 +786,7 @@ public TreeSet getImpl() { return Sets.newTreeSet(INT_COMPARATOR); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } public void testNewSortedSetMultimap() { diff --git a/guava-tests/test/com/google/common/collect/OrderingTest.java b/guava-tests/test/com/google/common/collect/OrderingTest.java index 60a8c23082f2..77a0a1893c6f 100644 --- a/guava-tests/test/com/google/common/collect/OrderingTest.java +++ b/guava-tests/test/com/google/common/collect/OrderingTest.java @@ -41,6 +41,7 @@ import com.google.common.collect.testing.Helpers; import com.google.common.testing.EqualsTester; import com.google.common.testing.NullPointerTester; +import java.io.Serial; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; @@ -841,7 +842,7 @@ public boolean equals(@Nullable Object other) { return other instanceof NumberOrdering; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /* diff --git a/guava-tests/test/com/google/common/collect/SpecialRandom.java b/guava-tests/test/com/google/common/collect/SpecialRandom.java index 571a061f74ae..23f9de09542b 100644 --- a/guava-tests/test/com/google/common/collect/SpecialRandom.java +++ b/guava-tests/test/com/google/common/collect/SpecialRandom.java @@ -16,6 +16,7 @@ package com.google.common.collect; +import java.io.Serial; import java.util.Random; import org.jspecify.annotations.NullUnmarked; @@ -52,5 +53,5 @@ public String toString() { return hasSeed ? "(seed:" + seed : "(default seed)"; } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } diff --git a/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java b/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java index fffb346966de..34285e91e3f3 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedBiMapTest.java @@ -26,6 +26,7 @@ import com.google.common.collect.testing.google.BiMapInverseTester; import com.google.common.collect.testing.google.BiMapTestSuiteBuilder; import com.google.common.collect.testing.google.TestStringBiMapGenerator; +import java.io.Serial; import java.util.Map.Entry; import java.util.Set; import java.util.function.BiFunction; @@ -140,7 +141,7 @@ public Set values() { return delegate.values(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } public void testForcePut() { diff --git a/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java b/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java index 6f0f7a734cec..538866cd7b81 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedDequeTest.java @@ -16,6 +16,7 @@ package com.google.common.collect; +import java.io.Serial; import java.util.ArrayDeque; import java.util.Collection; import java.util.Deque; @@ -254,7 +255,7 @@ public Iterator descendingIterator() { return delegate.descendingIterator(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } @SuppressWarnings("CheckReturnValue") diff --git a/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java b/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java index b1ab77b6ff46..533b6a0f1cd9 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedMapTest.java @@ -21,6 +21,7 @@ import com.google.common.collect.Synchronized.SynchronizedCollection; import com.google.common.collect.Synchronized.SynchronizedSet; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.HashMap; @@ -151,7 +152,7 @@ public String toString() { return super.toString(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } /* diff --git a/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java b/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java index f5f322d202cf..4c54961baf0f 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedMultimapTest.java @@ -26,6 +26,7 @@ import com.google.common.collect.testing.features.MapFeature; import com.google.common.collect.testing.google.SetMultimapTestSuiteBuilder; import com.google.common.collect.testing.google.TestStringSetMultimapGenerator; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Map; @@ -219,7 +220,7 @@ public Map> asMap() { return super.asMap(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } public void testSynchronizedListMultimap() { diff --git a/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java b/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java index 4e1f5b336e17..c228ff636667 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedNavigableMapTest.java @@ -26,6 +26,7 @@ import com.google.common.collect.testing.features.CollectionSize; import com.google.common.collect.testing.features.MapFeature; import com.google.common.testing.SerializableTester; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; import java.util.Map.Entry; @@ -97,7 +98,7 @@ public V setValue(V value) { return super.setValue(value); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } static class TestMap extends SynchronizedMapTest.TestMap @@ -254,7 +255,7 @@ public K lastKey() { return delegate().lastKey(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } @AndroidIncompatible // test-suite builders diff --git a/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java b/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java index 287599ff6243..60d551c740e3 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedNavigableSetTest.java @@ -23,6 +23,7 @@ import com.google.common.collect.testing.TestStringSortedSetGenerator; import com.google.common.collect.testing.features.CollectionFeature; import com.google.common.collect.testing.features.CollectionSize; +import java.io.Serial; import java.util.Collections; import java.util.Comparator; import java.util.Iterator; @@ -161,7 +162,7 @@ public E last() { return delegate().last(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } @AndroidIncompatible // test-suite builders diff --git a/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java b/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java index 4f236aa7b84d..6c227f3fb122 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedQueueTest.java @@ -16,6 +16,7 @@ package com.google.common.collect; +import java.io.Serial; import java.util.ArrayDeque; import java.util.Collection; import java.util.Iterator; @@ -152,7 +153,7 @@ public T[] toArray(T[] array) { return delegate.toArray(array); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } @SuppressWarnings("CheckReturnValue") diff --git a/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java b/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java index a80315812249..909cb97d7769 100644 --- a/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java +++ b/guava-tests/test/com/google/common/collect/SynchronizedTableTest.java @@ -16,6 +16,7 @@ package com.google.common.collect; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Map; @@ -162,7 +163,7 @@ public Map> rowMap() { return delegate.rowMap(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } @Override diff --git a/guava-tests/test/com/google/common/eventbus/SubscriberTest.java b/guava-tests/test/com/google/common/eventbus/SubscriberTest.java index 4c9bbb7b6254..42d269cd0ae9 100644 --- a/guava-tests/test/com/google/common/eventbus/SubscriberTest.java +++ b/guava-tests/test/com/google/common/eventbus/SubscriberTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertThrows; import com.google.common.testing.EqualsTester; +import java.io.Serial; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import junit.framework.TestCase; @@ -127,7 +128,7 @@ public void exceptionThrowingMethod(Object arg) throws Exception { /** Local exception subclass to check variety of exception thrown. */ class IntentionalException extends Exception { - private static final long serialVersionUID = -2500191180248181379L; + @Serial private static final long serialVersionUID = -2500191180248181379L; } @Subscribe @@ -142,6 +143,6 @@ public void threadSafeMethod(Object arg) {} /** Local Error subclass to check variety of error thrown. */ class JudgmentError extends Error { - private static final long serialVersionUID = 634248373797713373L; + @Serial private static final long serialVersionUID = 634248373797713373L; } } diff --git a/guava-tests/test/com/google/common/io/FilesTest.java b/guava-tests/test/com/google/common/io/FilesTest.java index 1111471e185e..e4651233ed55 100644 --- a/guava-tests/test/com/google/common/io/FilesTest.java +++ b/guava-tests/test/com/google/common/io/FilesTest.java @@ -33,6 +33,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.RandomAccessFile; +import java.io.Serial; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel.MapMode; @@ -116,7 +117,7 @@ public long length() { return badLength; } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } public void testToString() throws IOException { @@ -275,7 +276,7 @@ public boolean setLastModified(long t) { return false; } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; })); } @@ -405,7 +406,7 @@ public boolean delete() { return canDelete && super.delete(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } public void testLineReading() throws IOException { diff --git a/guava/src/com/google/common/base/Absent.java b/guava/src/com/google/common/base/Absent.java index f9aff2a3229d..43c63239079c 100644 --- a/guava/src/com/google/common/base/Absent.java +++ b/guava/src/com/google/common/base/Absent.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.Collections; import java.util.Set; import org.jspecify.annotations.Nullable; @@ -97,5 +98,5 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/base/CaseFormat.java b/guava/src/com/google/common/base/CaseFormat.java index c3b1afe9cf3e..54d3bab0bcfc 100644 --- a/guava/src/com/google/common/base/CaseFormat.java +++ b/guava/src/com/google/common/base/CaseFormat.java @@ -20,6 +20,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -204,7 +205,7 @@ public String toString() { return sourceFormat + ".converterTo(" + targetFormat + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } abstract String normalizeWord(String word); diff --git a/guava/src/com/google/common/base/Converter.java b/guava/src/com/google/common/base/Converter.java index 270dcc1f75ee..be2e7941a67e 100644 --- a/guava/src/com/google/common/base/Converter.java +++ b/guava/src/com/google/common/base/Converter.java @@ -25,6 +25,7 @@ import com.google.errorprone.annotations.InlineMe; import com.google.errorprone.annotations.concurrent.LazyInit; import com.google.j2objc.annotations.RetainedWith; +import java.io.Serial; import java.io.Serializable; import java.util.Iterator; import org.jspecify.annotations.Nullable; @@ -361,7 +362,7 @@ public String toString() { return original + ".reverse()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } /** @@ -436,7 +437,7 @@ public String toString() { return first + ".andThen(" + second + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } /** @@ -595,6 +596,6 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } } diff --git a/guava/src/com/google/common/base/Enums.java b/guava/src/com/google/common/base/Enums.java index 02bb3efb50e3..8f0a8c915280 100644 --- a/guava/src/com/google/common/base/Enums.java +++ b/guava/src/com/google/common/base/Enums.java @@ -18,6 +18,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.lang.ref.WeakReference; import java.lang.reflect.Field; @@ -150,6 +151,6 @@ public String toString() { return "Enums.stringConverter(" + enumClass.getName() + ".class)"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } } diff --git a/guava/src/com/google/common/base/Equivalence.java b/guava/src/com/google/common/base/Equivalence.java index 515b358434f9..0885a51cbfc8 100644 --- a/guava/src/com/google/common/base/Equivalence.java +++ b/guava/src/com/google/common/base/Equivalence.java @@ -21,6 +21,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.ForOverride; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.function.BiPredicate; import org.jspecify.annotations.NonNull; @@ -259,7 +260,7 @@ public String toString() { return equivalence + ".wrap(" + reference + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -330,7 +331,7 @@ public String toString() { return equivalence + ".equivalentTo(" + target + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -377,7 +378,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } static final class Identity extends Equivalence implements Serializable { @@ -398,6 +399,6 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } } diff --git a/guava/src/com/google/common/base/FunctionalEquivalence.java b/guava/src/com/google/common/base/FunctionalEquivalence.java index 3c50db2d8530..6a98b3eb0502 100644 --- a/guava/src/com/google/common/base/FunctionalEquivalence.java +++ b/guava/src/com/google/common/base/FunctionalEquivalence.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -31,7 +32,7 @@ @GwtCompatible final class FunctionalEquivalence extends Equivalence implements Serializable { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; private final Function function; private final Equivalence resultEquivalence; diff --git a/guava/src/com/google/common/base/Functions.java b/guava/src/com/google/common/base/Functions.java index f67859fcf59c..333a83581be1 100644 --- a/guava/src/com/google/common/base/Functions.java +++ b/guava/src/com/google/common/base/Functions.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Map; import org.jspecify.annotations.Nullable; @@ -179,7 +180,7 @@ public String toString() { return "Functions.forMap(" + map + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static class ForMapWithDefault @@ -222,7 +223,7 @@ public String toString() { return "Functions.forMap(" + map + ", defaultValue=" + defaultValue + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -279,7 +280,7 @@ public String toString() { return g + "(" + f + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -330,7 +331,7 @@ public String toString() { return "Functions.forPredicate(" + predicate + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -379,7 +380,7 @@ public String toString() { return "Functions.constant(" + value + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -431,6 +432,6 @@ public String toString() { return "Functions.forSupplier(" + supplier + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/guava/src/com/google/common/base/JdkPattern.java b/guava/src/com/google/common/base/JdkPattern.java index 66bf460e8bdc..54a2c779900a 100644 --- a/guava/src/com/google/common/base/JdkPattern.java +++ b/guava/src/com/google/common/base/JdkPattern.java @@ -16,6 +16,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -87,5 +88,5 @@ public int start() { } } - @J2ktIncompatible private static final long serialVersionUID = 0; + @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/base/Optional.java b/guava/src/com/google/common/base/Optional.java index 0cefcb06fe5c..bf652f491b79 100644 --- a/guava/src/com/google/common/base/Optional.java +++ b/guava/src/com/google/common/base/Optional.java @@ -20,6 +20,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.DoNotMock; +import java.io.Serial; import java.io.Serializable; import java.util.Iterator; import java.util.Set; @@ -355,5 +356,5 @@ public static Iterable presentInstances( }; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/base/PairwiseEquivalence.java b/guava/src/com/google/common/base/PairwiseEquivalence.java index bb4ffd068fb7..7c406772d816 100644 --- a/guava/src/com/google/common/base/PairwiseEquivalence.java +++ b/guava/src/com/google/common/base/PairwiseEquivalence.java @@ -17,6 +17,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Iterator; import org.jspecify.annotations.Nullable; @@ -74,5 +75,5 @@ public String toString() { return elementEquivalence + ".pairwise()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } diff --git a/guava/src/com/google/common/base/Predicates.java b/guava/src/com/google/common/base/Predicates.java index db3eef0d6037..3a39502b4efe 100644 --- a/guava/src/com/google/common/base/Predicates.java +++ b/guava/src/com/google/common/base/Predicates.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -353,7 +354,7 @@ public String toString() { return "Predicates.not(" + predicate + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -398,7 +399,7 @@ public String toString() { return toStringHelper("and", components); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -443,7 +444,7 @@ public String toString() { return toStringHelper("or", components); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static String toStringHelper(String methodName, Iterable components) { @@ -493,7 +494,7 @@ public String toString() { return "Predicates.equalTo(" + target + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; @SuppressWarnings("unchecked") // safe contravariant cast Predicate withNarrowedType() { @@ -537,7 +538,7 @@ public String toString() { return "Predicates.instanceOf(" + clazz.getName() + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -576,7 +577,7 @@ public String toString() { return "Predicates.subtypeOf(" + clazz.getName() + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -618,7 +619,7 @@ public String toString() { return "Predicates.in(" + target + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -659,7 +660,7 @@ public String toString() { return p + "(" + f + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -709,7 +710,7 @@ public String toString() { return "Predicates.contains(" + patternString + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -727,7 +728,7 @@ public String toString() { return "Predicates.containsPattern(" + pattern.pattern() + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static List> asList( diff --git a/guava/src/com/google/common/base/Present.java b/guava/src/com/google/common/base/Present.java index dcf6623aaba8..bfbf0076bb4a 100644 --- a/guava/src/com/google/common/base/Present.java +++ b/guava/src/com/google/common/base/Present.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.Collections; import java.util.Set; import org.jspecify.annotations.Nullable; @@ -97,5 +98,5 @@ public String toString() { return "Optional.of(" + reference + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/base/Suppliers.java b/guava/src/com/google/common/base/Suppliers.java index 28cf8e2a4b6d..2683c2e5376a 100644 --- a/guava/src/com/google/common/base/Suppliers.java +++ b/guava/src/com/google/common/base/Suppliers.java @@ -25,6 +25,7 @@ import com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.time.Duration; import java.util.concurrent.TimeUnit; @@ -89,7 +90,7 @@ public String toString() { return "Suppliers.compose(" + function + ", " + supplier + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -166,7 +167,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE lock = new Object(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @VisibleForTesting @@ -340,7 +341,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE lock = new Object(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** Returns a supplier that always supplies {@code instance}. */ @@ -382,7 +383,7 @@ public String toString() { return "Suppliers.ofInstance(" + instance + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -417,7 +418,7 @@ public String toString() { return "Suppliers.synchronizedSupplier(" + delegate + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/guava/src/com/google/common/cache/CacheLoader.java b/guava/src/com/google/common/cache/CacheLoader.java index 33b18fbfd75a..09ddb26011c8 100644 --- a/guava/src/com/google/common/cache/CacheLoader.java +++ b/guava/src/com/google/common/cache/CacheLoader.java @@ -24,6 +24,7 @@ import com.google.common.base.Supplier; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFutureTask; +import java.io.Serial; import java.io.Serializable; import java.util.Map; import java.util.concurrent.Executor; @@ -169,7 +170,7 @@ public V load(K key) { return computingFunction.apply(checkNotNull(key)); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -221,7 +222,7 @@ public V load(Object key) { return computingSupplier.get(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/guava/src/com/google/common/cache/LocalCache.java b/guava/src/com/google/common/cache/LocalCache.java index cb5abc6bf67b..2354e788e0d7 100644 --- a/guava/src/com/google/common/cache/LocalCache.java +++ b/guava/src/com/google/common/cache/LocalCache.java @@ -59,6 +59,7 @@ import java.io.IOException; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; @@ -4669,7 +4670,7 @@ public boolean remove(Object o) { */ static class ManualSerializationProxy extends ForwardingCache implements Serializable { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; final Strength keyStrength; final Strength valueStrength; @@ -4787,7 +4788,7 @@ protected Cache delegate() { */ static final class LoadingSerializationProxy extends ManualSerializationProxy implements LoadingCache { - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; transient @Nullable LoadingCache autoDelegate; @@ -4920,7 +4921,7 @@ public void cleanUp() { // Serialization Support - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; Object writeReplace() { return new ManualSerializationProxy<>(localCache); @@ -4973,7 +4974,7 @@ public final V apply(K key) { // Serialization Support - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; @Override Object writeReplace() { diff --git a/guava/src/com/google/common/cache/RemovalNotification.java b/guava/src/com/google/common/cache/RemovalNotification.java index e95c5e202140..fb32942c864b 100644 --- a/guava/src/com/google/common/cache/RemovalNotification.java +++ b/guava/src/com/google/common/cache/RemovalNotification.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.AbstractMap.SimpleImmutableEntry; import org.jspecify.annotations.Nullable; @@ -68,5 +69,5 @@ public boolean wasEvicted() { return cause.wasEvicted(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/AbstractBiMap.java b/guava/src/com/google/common/collect/AbstractBiMap.java index ae71bb4ce1e1..19090450befb 100644 --- a/guava/src/com/google/common/collect/AbstractBiMap.java +++ b/guava/src/com/google/common/collect/AbstractBiMap.java @@ -32,6 +32,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; @@ -507,8 +508,8 @@ Object readResolve() { return inverse().inverse(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/AbstractListMultimap.java b/guava/src/com/google/common/collect/AbstractListMultimap.java index 6cb094381af2..020e1ac49fd5 100644 --- a/guava/src/com/google/common/collect/AbstractListMultimap.java +++ b/guava/src/com/google/common/collect/AbstractListMultimap.java @@ -23,6 +23,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.util.Collection; import java.util.List; import java.util.Map; @@ -142,6 +143,6 @@ public boolean equals(@Nullable Object object) { return super.equals(object); } - @GwtIncompatible @J2ktIncompatible + @GwtIncompatible @J2ktIncompatible @Serial 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 312176571a6c..6eb4ce2f7539 100644 --- a/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java +++ b/guava/src/com/google/common/collect/AbstractMapBasedMultimap.java @@ -29,6 +29,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.collect.Maps.ViewCachingAbstractMap; import com.google.j2objc.annotations.WeakOuter; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractCollection; import java.util.Collection; @@ -1681,6 +1682,6 @@ public NavigableMap> tailMap( } } - @GwtIncompatible @J2ktIncompatible + @GwtIncompatible @J2ktIncompatible @Serial 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 a2c42672cbdb..0fec32094d89 100644 --- a/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java +++ b/guava/src/com/google/common/collect/AbstractMapBasedMultiset.java @@ -31,6 +31,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.io.InvalidObjectException; import java.io.ObjectStreamException; +import java.io.Serial; import java.io.Serializable; import java.util.ConcurrentModificationException; import java.util.Iterator; @@ -349,6 +350,6 @@ private void readObjectNoData() throws ObjectStreamException { throw new InvalidObjectException("Stream data required"); } - @GwtIncompatible @J2ktIncompatible + @GwtIncompatible @J2ktIncompatible @Serial 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 e46360997300..f94f454aa53f 100644 --- a/guava/src/com/google/common/collect/AbstractSetMultimap.java +++ b/guava/src/com/google/common/collect/AbstractSetMultimap.java @@ -23,6 +23,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; @@ -153,6 +154,6 @@ public boolean equals(@Nullable Object object) { return super.equals(object); } - @GwtIncompatible @J2ktIncompatible + @GwtIncompatible @J2ktIncompatible @Serial 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 6441cde91b09..bdd5ded9066c 100644 --- a/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java +++ b/guava/src/com/google/common/collect/AbstractSortedSetMultimap.java @@ -23,6 +23,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.util.Collection; import java.util.Map; import java.util.NavigableSet; @@ -149,6 +150,6 @@ public Collection values() { return super.values(); } - @GwtIncompatible @J2ktIncompatible + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 430848587173315748L; } diff --git a/guava/src/com/google/common/collect/AllEqualOrdering.java b/guava/src/com/google/common/collect/AllEqualOrdering.java index e6d515c95fcc..2f39370222dc 100644 --- a/guava/src/com/google/common/collect/AllEqualOrdering.java +++ b/guava/src/com/google/common/collect/AllEqualOrdering.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.List; import org.jspecify.annotations.Nullable; @@ -63,5 +64,5 @@ public String toString() { return "Ordering.allEqual()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ArrayListMultimap.java b/guava/src/com/google/common/collect/ArrayListMultimap.java index 2602bb9457de..f372fa05ce70 100644 --- a/guava/src/com/google/common/collect/ArrayListMultimap.java +++ b/guava/src/com/google/common/collect/ArrayListMultimap.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -175,5 +176,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMultimap(this, stream, distinctKeys); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ArrayTable.java b/guava/src/com/google/common/collect/ArrayTable.java index 670ae449abb9..4cc4c6676cfe 100644 --- a/guava/src/com/google/common/collect/ArrayTable.java +++ b/guava/src/com/google/common/collect/ArrayTable.java @@ -31,6 +31,7 @@ import com.google.errorprone.annotations.DoNotCall; import com.google.errorprone.annotations.concurrent.LazyInit; import com.google.j2objc.annotations.WeakOuter; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Array; import java.util.Arrays; @@ -803,5 +804,5 @@ String getKeyRole() { return CollectSpliterators.<@Nullable V>indexed(size(), Spliterator.ORDERED, this::getValue); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ByFunctionOrdering.java b/guava/src/com/google/common/collect/ByFunctionOrdering.java index 143e7be5562b..909da420385f 100644 --- a/guava/src/com/google/common/collect/ByFunctionOrdering.java +++ b/guava/src/com/google/common/collect/ByFunctionOrdering.java @@ -23,6 +23,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Function; import com.google.common.base.Objects; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -68,5 +69,5 @@ public String toString() { return ordering + ".onResultOf(" + function + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ComparatorOrdering.java b/guava/src/com/google/common/collect/ComparatorOrdering.java index 410875167955..9af3781f65ef 100644 --- a/guava/src/com/google/common/collect/ComparatorOrdering.java +++ b/guava/src/com/google/common/collect/ComparatorOrdering.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; import org.jspecify.annotations.Nullable; @@ -62,5 +63,5 @@ public String toString() { return comparator.toString(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/CompoundOrdering.java b/guava/src/com/google/common/collect/CompoundOrdering.java index 6e922f3316bc..26e0b4784e42 100644 --- a/guava/src/com/google/common/collect/CompoundOrdering.java +++ b/guava/src/com/google/common/collect/CompoundOrdering.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Comparator; @@ -74,5 +75,5 @@ public String toString() { return "Ordering.compound(" + Arrays.toString(comparators) + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ComputationException.java b/guava/src/com/google/common/collect/ComputationException.java index d5f6bcd26a82..cadb1719f567 100644 --- a/guava/src/com/google/common/collect/ComputationException.java +++ b/guava/src/com/google/common/collect/ComputationException.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import org.jspecify.annotations.Nullable; /** @@ -42,5 +43,5 @@ public ComputationException(@Nullable Throwable cause) { super(cause); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ConcurrentHashMultiset.java b/guava/src/com/google/common/collect/ConcurrentHashMultiset.java index ea831cd57562..233a66b572fe 100644 --- a/guava/src/com/google/common/collect/ConcurrentHashMultiset.java +++ b/guava/src/com/google/common/collect/ConcurrentHashMultiset.java @@ -36,6 +36,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; @@ -608,5 +609,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo FieldSettersHolder.COUNT_MAP_FIELD_SETTER.set(this, deserializedCountMap); } - private static final long serialVersionUID = 1; + @Serial private static final long serialVersionUID = 1; } diff --git a/guava/src/com/google/common/collect/Cut.java b/guava/src/com/google/common/collect/Cut.java index 4d682aee35d4..3c220f531124 100644 --- a/guava/src/com/google/common/collect/Cut.java +++ b/guava/src/com/google/common/collect/Cut.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.NoSuchElementException; import org.jspecify.annotations.Nullable; @@ -117,7 +118,7 @@ static Cut belowAll() { return (Cut) BelowAll.INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; private static final class BelowAll extends Cut> { private static final BelowAll INSTANCE = new BelowAll(); @@ -212,7 +213,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /* @@ -303,7 +304,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static Cut belowValue(C endpoint) { @@ -384,7 +385,7 @@ public String toString() { return "\\" + endpoint + "/"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static Cut aboveValue(C endpoint) { @@ -471,6 +472,6 @@ public String toString() { return "/" + endpoint + "\\"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/guava/src/com/google/common/collect/DiscreteDomain.java b/guava/src/com/google/common/collect/DiscreteDomain.java index 13e7be404726..feef267b9861 100644 --- a/guava/src/com/google/common/collect/DiscreteDomain.java +++ b/guava/src/com/google/common/collect/DiscreteDomain.java @@ -24,6 +24,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.primitives.Ints; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.io.Serializable; import java.math.BigInteger; import java.util.NoSuchElementException; @@ -110,7 +111,7 @@ public String toString() { return "DiscreteDomain.integers()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -185,7 +186,7 @@ public String toString() { return "DiscreteDomain.longs()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -241,7 +242,7 @@ public String toString() { return "DiscreteDomain.bigIntegers()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } final boolean supportsFastOffset; diff --git a/guava/src/com/google/common/collect/EmptyContiguousSet.java b/guava/src/com/google/common/collect/EmptyContiguousSet.java index 2f02a9e430bb..5f96fe880991 100644 --- a/guava/src/com/google/common/collect/EmptyContiguousSet.java +++ b/guava/src/com/google/common/collect/EmptyContiguousSet.java @@ -20,6 +20,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.NoSuchElementException; import java.util.Set; @@ -158,7 +159,7 @@ private Object readResolve() { return new EmptyContiguousSet<>(domain); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @GwtIncompatible // serialization diff --git a/guava/src/com/google/common/collect/EmptyImmutableListMultimap.java b/guava/src/com/google/common/collect/EmptyImmutableListMultimap.java index 86aa27dbfb51..91eddaac0816 100644 --- a/guava/src/com/google/common/collect/EmptyImmutableListMultimap.java +++ b/guava/src/com/google/common/collect/EmptyImmutableListMultimap.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.Collection; /** @@ -49,5 +50,5 @@ private Object readResolve() { return INSTANCE; // preserve singleton property } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/EmptyImmutableSetMultimap.java b/guava/src/com/google/common/collect/EmptyImmutableSetMultimap.java index 7e713d32f18f..54450c7033cc 100644 --- a/guava/src/com/google/common/collect/EmptyImmutableSetMultimap.java +++ b/guava/src/com/google/common/collect/EmptyImmutableSetMultimap.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.util.Collection; /** @@ -49,5 +50,5 @@ private Object readResolve() { return INSTANCE; // preserve singleton property } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/EnumBiMap.java b/guava/src/com/google/common/collect/EnumBiMap.java index f8f430c2f642..20d2306113d8 100644 --- a/guava/src/com/google/common/collect/EnumBiMap.java +++ b/guava/src/com/google/common/collect/EnumBiMap.java @@ -27,6 +27,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.EnumMap; import java.util.Map; @@ -158,5 +159,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMap(this, stream); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/EnumHashBiMap.java b/guava/src/com/google/common/collect/EnumHashBiMap.java index b585d571b5ae..316a3765d5af 100644 --- a/guava/src/com/google/common/collect/EnumHashBiMap.java +++ b/guava/src/com/google/common/collect/EnumHashBiMap.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.EnumMap; import java.util.HashMap; import java.util.Map; @@ -135,5 +136,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMap(this, stream); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/EnumMultiset.java b/guava/src/com/google/common/collect/EnumMultiset.java index 390d8b7c1f17..a3b66138b746 100644 --- a/guava/src/com/google/common/collect/EnumMultiset.java +++ b/guava/src/com/google/common/collect/EnumMultiset.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Iterator; @@ -317,5 +318,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMultiset(this, stream); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/EvictingQueue.java b/guava/src/com/google/common/collect/EvictingQueue.java index 957d10b7eb76..f7d7d095fe9c 100644 --- a/guava/src/com/google/common/collect/EvictingQueue.java +++ b/guava/src/com/google/common/collect/EvictingQueue.java @@ -24,6 +24,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayDeque; import java.util.Collection; @@ -141,5 +142,5 @@ public Object[] toArray() { return super.toArray(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } diff --git a/guava/src/com/google/common/collect/ExplicitOrdering.java b/guava/src/com/google/common/collect/ExplicitOrdering.java index 412bcf1613b3..d5d6736395c2 100644 --- a/guava/src/com/google/common/collect/ExplicitOrdering.java +++ b/guava/src/com/google/common/collect/ExplicitOrdering.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.List; import org.jspecify.annotations.Nullable; @@ -68,5 +69,5 @@ public String toString() { return "Ordering.explicit(" + rankMap.keySet() + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/HashBasedTable.java b/guava/src/com/google/common/collect/HashBasedTable.java index db3f7d660af1..9f943e013a3e 100644 --- a/guava/src/com/google/common/collect/HashBasedTable.java +++ b/guava/src/com/google/common/collect/HashBasedTable.java @@ -22,6 +22,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Supplier; +import java.io.Serial; import java.io.Serializable; import java.util.LinkedHashMap; import java.util.Map; @@ -62,7 +63,7 @@ public Map get() { return Maps.newLinkedHashMapWithExpectedSize(expectedSize); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** Creates an empty {@code HashBasedTable}. */ @@ -103,5 +104,5 @@ public static HashBasedTable create( super(backingMap, factory); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/HashBiMap.java b/guava/src/com/google/common/collect/HashBiMap.java index f5254b367e72..3b6170b99215 100644 --- a/guava/src/com/google/common/collect/HashBiMap.java +++ b/guava/src/com/google/common/collect/HashBiMap.java @@ -33,6 +33,7 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.ConcurrentModificationException; @@ -794,5 +795,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMap(this, stream, size); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/HashMultimap.java b/guava/src/com/google/common/collect/HashMultimap.java index 719c0b40f66e..7c7c3dbacd39 100644 --- a/guava/src/com/google/common/collect/HashMultimap.java +++ b/guava/src/com/google/common/collect/HashMultimap.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.Collection; import java.util.Map; import java.util.Set; @@ -151,5 +152,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMultimap(this, stream, distinctKeys); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/HashMultiset.java b/guava/src/com/google/common/collect/HashMultiset.java index 493568b071d3..fd22953707f6 100644 --- a/guava/src/com/google/common/collect/HashMultiset.java +++ b/guava/src/com/google/common/collect/HashMultiset.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.HashMap; import org.jspecify.annotations.Nullable; @@ -93,5 +94,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMultiset(this, stream, distinctElements); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ImmutableAsList.java b/guava/src/com/google/common/collect/ImmutableAsList.java index b94e7f5d26cf..37729afcd62d 100644 --- a/guava/src/com/google/common/collect/ImmutableAsList.java +++ b/guava/src/com/google/common/collect/ImmutableAsList.java @@ -21,6 +21,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -72,7 +73,7 @@ Object readResolve() { return collection.asList(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @GwtIncompatible // serialization diff --git a/guava/src/com/google/common/collect/ImmutableBiMap.java b/guava/src/com/google/common/collect/ImmutableBiMap.java index 6d9b7b9d5d20..65e1f8f5df16 100644 --- a/guava/src/com/google/common/collect/ImmutableBiMap.java +++ b/guava/src/com/google/common/collect/ImmutableBiMap.java @@ -29,6 +29,7 @@ import com.google.errorprone.annotations.DoNotCall; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.util.Arrays; import java.util.Comparator; import java.util.Map; @@ -629,7 +630,7 @@ Builder makeBuilder(int size) { return new Builder<>(size); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @Override @@ -677,5 +678,6 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException throw new UnsupportedOperationException(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe; + @GwtIncompatible @J2ktIncompatible @Serial + 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 20b94dd759f6..655f5d2fc02c 100644 --- a/guava/src/com/google/common/collect/ImmutableCollection.java +++ b/guava/src/com/google/common/collect/ImmutableCollection.java @@ -26,6 +26,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractCollection; import java.util.Collection; @@ -506,5 +507,6 @@ public Builder addAll(Iterator elements) { public abstract ImmutableCollection build(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe; + @GwtIncompatible @J2ktIncompatible @Serial + private static final long serialVersionUID = 0xcafebabe; } diff --git a/guava/src/com/google/common/collect/ImmutableEntry.java b/guava/src/com/google/common/collect/ImmutableEntry.java index 1cc8ac35077d..bf245bbcbf15 100644 --- a/guava/src/com/google/common/collect/ImmutableEntry.java +++ b/guava/src/com/google/common/collect/ImmutableEntry.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -56,5 +57,5 @@ public final V setValue(@ParametricNullness V value) { throw new UnsupportedOperationException(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ImmutableEnumMap.java b/guava/src/com/google/common/collect/ImmutableEnumMap.java index 0ff666553405..49b7943c0c3c 100644 --- a/guava/src/com/google/common/collect/ImmutableEnumMap.java +++ b/guava/src/com/google/common/collect/ImmutableEnumMap.java @@ -25,6 +25,7 @@ import com.google.common.collect.ImmutableMap.IteratorBasedImmutableMap; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.EnumMap; import java.util.Spliterator; @@ -141,6 +142,6 @@ Object readResolve() { return new ImmutableEnumMap<>(delegate); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/guava/src/com/google/common/collect/ImmutableEnumSet.java b/guava/src/com/google/common/collect/ImmutableEnumSet.java index d01717cdb452..0156985f40d6 100644 --- a/guava/src/com/google/common/collect/ImmutableEnumSet.java +++ b/guava/src/com/google/common/collect/ImmutableEnumSet.java @@ -24,6 +24,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.EnumSet; @@ -164,6 +165,6 @@ Object readResolve() { return new ImmutableEnumSet(delegate.clone()); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/guava/src/com/google/common/collect/ImmutableList.java b/guava/src/com/google/common/collect/ImmutableList.java index fd8635a67419..f0023bbddc55 100644 --- a/guava/src/com/google/common/collect/ImmutableList.java +++ b/guava/src/com/google/common/collect/ImmutableList.java @@ -34,6 +34,7 @@ import com.google.errorprone.annotations.InlineMe; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -737,7 +738,7 @@ Object readResolve() { return copyOf(elements); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @J2ktIncompatible // serialization @@ -941,5 +942,6 @@ ImmutableList buildSorted(Comparator comparator) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe; + @GwtIncompatible @J2ktIncompatible @Serial + private static final long serialVersionUID = 0xcafebabe; } diff --git a/guava/src/com/google/common/collect/ImmutableListMultimap.java b/guava/src/com/google/common/collect/ImmutableListMultimap.java index 0f326296a8eb..deb3155a6450 100644 --- a/guava/src/com/google/common/collect/ImmutableListMultimap.java +++ b/guava/src/com/google/common/collect/ImmutableListMultimap.java @@ -30,6 +30,7 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.Collection; import java.util.Comparator; import java.util.Map; @@ -552,5 +553,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo FieldSettersHolder.SIZE_FIELD_SETTER.set(this, tmpSize); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ImmutableMap.java b/guava/src/com/google/common/collect/ImmutableMap.java index 729756fa0548..2612425013f6 100644 --- a/guava/src/com/google/common/collect/ImmutableMap.java +++ b/guava/src/com/google/common/collect/ImmutableMap.java @@ -36,6 +36,7 @@ import com.google.j2objc.annotations.WeakOuter; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.BitSet; @@ -1300,7 +1301,7 @@ Builder makeBuilder(int size) { return new Builder<>(size); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -1318,5 +1319,6 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException throw new InvalidObjectException("Use SerializedForm"); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe; + @GwtIncompatible @J2ktIncompatible @Serial + private static final long serialVersionUID = 0xcafebabe; } diff --git a/guava/src/com/google/common/collect/ImmutableMapEntrySet.java b/guava/src/com/google/common/collect/ImmutableMapEntrySet.java index 66c6a7b51d99..356e5c4e2ee9 100644 --- a/guava/src/com/google/common/collect/ImmutableMapEntrySet.java +++ b/guava/src/com/google/common/collect/ImmutableMapEntrySet.java @@ -21,6 +21,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Map.Entry; import java.util.Spliterator; @@ -150,6 +151,6 @@ Object readResolve() { return map.entrySet(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/guava/src/com/google/common/collect/ImmutableMapKeySet.java b/guava/src/com/google/common/collect/ImmutableMapKeySet.java index 1719dec3c488..1ac154c29601 100644 --- a/guava/src/com/google/common/collect/ImmutableMapKeySet.java +++ b/guava/src/com/google/common/collect/ImmutableMapKeySet.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Spliterator; import java.util.function.Consumer; @@ -100,6 +101,6 @@ Object readResolve() { return map.keySet(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/guava/src/com/google/common/collect/ImmutableMapValues.java b/guava/src/com/google/common/collect/ImmutableMapValues.java index 82812171ff54..244fefaa1ce7 100644 --- a/guava/src/com/google/common/collect/ImmutableMapValues.java +++ b/guava/src/com/google/common/collect/ImmutableMapValues.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Map.Entry; import java.util.Spliterator; @@ -134,6 +135,6 @@ Object readResolve() { return map.values(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/guava/src/com/google/common/collect/ImmutableMultimap.java b/guava/src/com/google/common/collect/ImmutableMultimap.java index e19a43834d40..b612ba69ce4f 100644 --- a/guava/src/com/google/common/collect/ImmutableMultimap.java +++ b/guava/src/com/google/common/collect/ImmutableMultimap.java @@ -35,6 +35,7 @@ import com.google.j2objc.annotations.WeakOuter; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Comparator; @@ -657,7 +658,7 @@ Object writeReplace() { return super.writeReplace(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @Override @@ -869,8 +870,8 @@ Object writeReplace() { return super.writeReplace(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ImmutableMultiset.java b/guava/src/com/google/common/collect/ImmutableMultiset.java index 6f3bc2893aee..74dfe179997f 100644 --- a/guava/src/com/google/common/collect/ImmutableMultiset.java +++ b/guava/src/com/google/common/collect/ImmutableMultiset.java @@ -29,6 +29,7 @@ import com.google.j2objc.annotations.WeakOuter; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -417,7 +418,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException throw new InvalidObjectException("Use EntrySetSerializedForm"); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @GwtIncompatible @@ -667,8 +668,9 @@ Object readResolve() { return ImmutableMultiset.copyOf(multiset); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe; + @GwtIncompatible @J2ktIncompatible @Serial + private static final long serialVersionUID = 0xcafebabe; } diff --git a/guava/src/com/google/common/collect/ImmutableRangeMap.java b/guava/src/com/google/common/collect/ImmutableRangeMap.java index 801a10e6b024..77d184196d62 100644 --- a/guava/src/com/google/common/collect/ImmutableRangeMap.java +++ b/guava/src/com/google/common/collect/ImmutableRangeMap.java @@ -29,6 +29,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.List; import java.util.Map; @@ -447,7 +448,7 @@ Object createRangeMap() { return builder.build(); } - @J2ktIncompatible private static final long serialVersionUID = 0; + @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } Object writeReplace() { @@ -459,5 +460,5 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException throw new InvalidObjectException("Use SerializedForm"); } - @J2ktIncompatible private static final long serialVersionUID = 0; + @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ImmutableSet.java b/guava/src/com/google/common/collect/ImmutableSet.java index 1ce15c3196f5..ce3209883fe5 100644 --- a/guava/src/com/google/common/collect/ImmutableSet.java +++ b/guava/src/com/google/common/collect/ImmutableSet.java @@ -34,6 +34,7 @@ import com.google.j2objc.annotations.RetainedWith; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.math.RoundingMode; import java.util.Arrays; @@ -413,7 +414,7 @@ Object readResolve() { return copyOf(elements); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @Override @@ -996,5 +997,6 @@ private static int estimatedSizeForUnknownDuplication(int inputElementsIncluding sqrt(inputElementsIncludingAnyDuplicates, RoundingMode.CEILING)); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe; + @GwtIncompatible @J2ktIncompatible @Serial + private static final long serialVersionUID = 0xcafebabe; } diff --git a/guava/src/com/google/common/collect/ImmutableSetMultimap.java b/guava/src/com/google/common/collect/ImmutableSetMultimap.java index 85043461964a..6083258146f7 100644 --- a/guava/src/com/google/common/collect/ImmutableSetMultimap.java +++ b/guava/src/com/google/common/collect/ImmutableSetMultimap.java @@ -35,6 +35,7 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.Collection; import java.util.Comparator; import java.util.Map; @@ -728,5 +729,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo SetFieldSettersHolder.EMPTY_SET_FIELD_SETTER.set(this, emptySet(valueComparator)); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ImmutableSortedMap.java b/guava/src/com/google/common/collect/ImmutableSortedMap.java index 8ec5d540c29c..2f4b1b9149e4 100644 --- a/guava/src/com/google/common/collect/ImmutableSortedMap.java +++ b/guava/src/com/google/common/collect/ImmutableSortedMap.java @@ -30,6 +30,7 @@ import com.google.errorprone.annotations.DoNotCall; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.util.AbstractMap; import java.util.Comparator; import java.util.Map; @@ -1154,7 +1155,7 @@ Builder makeBuilder(int size) { return new Builder<>(comparator); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @Override @@ -1170,7 +1171,7 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException // This class is never actually serialized directly, but we have to make the // warning go away (and suppressing would suppress for all nested classes too) - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; /** * Not supported. Use {@link #toImmutableSortedMap}, which offers better type-safety, instead. diff --git a/guava/src/com/google/common/collect/ImmutableSortedMultiset.java b/guava/src/com/google/common/collect/ImmutableSortedMultiset.java index 266d2eca8694..374c2dd84d52 100644 --- a/guava/src/com/google/common/collect/ImmutableSortedMultiset.java +++ b/guava/src/com/google/common/collect/ImmutableSortedMultiset.java @@ -24,6 +24,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -759,5 +760,5 @@ public static ImmutableSortedMultiset copyOf(Z[] elements) { throw new UnsupportedOperationException(); } - @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe; + @J2ktIncompatible @Serial 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 4a457b394e44..13ae12399099 100644 --- a/guava/src/com/google/common/collect/ImmutableSortedSet.java +++ b/guava/src/com/google/common/collect/ImmutableSortedSet.java @@ -30,6 +30,7 @@ import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -870,7 +871,7 @@ Object readResolve() { return new Builder(comparator).add((E[]) elements).build(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @J2ktIncompatible // serialization @@ -1031,5 +1032,6 @@ public static ImmutableSortedSet copyOf(Z[] elements) { throw new UnsupportedOperationException(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe; + @GwtIncompatible @J2ktIncompatible @Serial + 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 600725993cdb..b888926c3617 100644 --- a/guava/src/com/google/common/collect/ImmutableTable.java +++ b/guava/src/com/google/common/collect/ImmutableTable.java @@ -29,6 +29,7 @@ import com.google.errorprone.annotations.DoNotMock; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; import java.util.Iterator; @@ -495,7 +496,7 @@ Object readResolve() { cellListBuilder.build(), ImmutableSet.copyOf(rowKeys), ImmutableSet.copyOf(columnKeys)); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @J2ktIncompatible // serialization @@ -508,5 +509,6 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException throw new InvalidObjectException("Use SerializedForm"); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0xcafebabe; + @GwtIncompatible @J2ktIncompatible @Serial + private static final long serialVersionUID = 0xcafebabe; } diff --git a/guava/src/com/google/common/collect/LexicographicalOrdering.java b/guava/src/com/google/common/collect/LexicographicalOrdering.java index c899759b15b9..38775803f249 100644 --- a/guava/src/com/google/common/collect/LexicographicalOrdering.java +++ b/guava/src/com/google/common/collect/LexicographicalOrdering.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; import java.util.Iterator; @@ -75,5 +76,5 @@ public String toString() { return elementOrder + ".lexicographical()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/LinkedHashMultimap.java b/guava/src/com/google/common/collect/LinkedHashMultimap.java index cb3e552ffb7f..281281f0a44e 100644 --- a/guava/src/com/google/common/collect/LinkedHashMultimap.java +++ b/guava/src/com/google/common/collect/LinkedHashMultimap.java @@ -31,6 +31,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.Arrays; import java.util.Collection; import java.util.ConcurrentModificationException; @@ -658,5 +659,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo setMap(map); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } diff --git a/guava/src/com/google/common/collect/LinkedHashMultiset.java b/guava/src/com/google/common/collect/LinkedHashMultiset.java index 0a43d7ed0e03..06bad8c7096e 100644 --- a/guava/src/com/google/common/collect/LinkedHashMultiset.java +++ b/guava/src/com/google/common/collect/LinkedHashMultiset.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.LinkedHashMap; import org.jspecify.annotations.Nullable; @@ -101,5 +102,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMultiset(this, stream, distinctElements); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/LinkedListMultimap.java b/guava/src/com/google/common/collect/LinkedListMultimap.java index d0003fd46ad6..7211f433da05 100644 --- a/guava/src/com/google/common/collect/LinkedListMultimap.java +++ b/guava/src/com/google/common/collect/LinkedListMultimap.java @@ -30,6 +30,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractSequentialList; import java.util.Collection; @@ -886,5 +887,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/Lists.java b/guava/src/com/google/common/collect/Lists.java index 0d5afd8fc860..44a1fe321a8a 100644 --- a/guava/src/com/google/common/collect/Lists.java +++ b/guava/src/com/google/common/collect/Lists.java @@ -35,6 +35,7 @@ import com.google.common.base.Objects; import com.google.common.math.IntMath; import com.google.common.primitives.Ints; +import java.io.Serial; import java.io.Serializable; import java.math.RoundingMode; import java.util.AbstractList; @@ -362,7 +363,7 @@ public E get(int index) { return (index == 0) ? first : rest[index - 1]; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -400,7 +401,7 @@ public E get(int index) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -611,7 +612,7 @@ public boolean removeIf(Predicate filter) { return fromList.removeIf(element -> filter.test(function.apply(element))); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -684,7 +685,7 @@ public int size() { return fromList.size(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -1147,7 +1148,8 @@ public ListIterator listIterator(int index) { return backingList.listIterator(index); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial + private static final long serialVersionUID = 0; }; } else { wrapper = @@ -1157,7 +1159,8 @@ public ListIterator listIterator(int index) { return backingList.listIterator(index); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial + private static final long serialVersionUID = 0; }; } return wrapper.subList(fromIndex, toIndex); diff --git a/guava/src/com/google/common/collect/MapMakerInternalMap.java b/guava/src/com/google/common/collect/MapMakerInternalMap.java index 984c42fbb6b9..049c7535898e 100644 --- a/guava/src/com/google/common/collect/MapMakerInternalMap.java +++ b/guava/src/com/google/common/collect/MapMakerInternalMap.java @@ -33,6 +33,7 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; @@ -2811,7 +2812,7 @@ public void clear() { // Serialization Support - private static final long serialVersionUID = 5; + @Serial private static final long serialVersionUID = 5; Object writeReplace() { return new SerializationProxy<>( @@ -2834,7 +2835,7 @@ private void readObject(ObjectInputStream in) throws InvalidObjectException { */ abstract static class AbstractSerializationProxy extends ForwardingConcurrentMap implements Serializable { - private static final long serialVersionUID = 3; + @Serial private static final long serialVersionUID = 3; final Strength keyStrength; final Strength valueStrength; @@ -2903,7 +2904,7 @@ void readEntries(ObjectInputStream in) throws IOException, ClassNotFoundExceptio * circular dependency is present, so the proxy must be able to behave as the map itself. */ private static final class SerializationProxy extends AbstractSerializationProxy { - private static final long serialVersionUID = 3; + @Serial private static final long serialVersionUID = 3; SerializationProxy( Strength keyStrength, diff --git a/guava/src/com/google/common/collect/Maps.java b/guava/src/com/google/common/collect/Maps.java index 924efbb08678..a89c1e38dc03 100644 --- a/guava/src/com/google/common/collect/Maps.java +++ b/guava/src/com/google/common/collect/Maps.java @@ -45,6 +45,7 @@ import com.google.j2objc.annotations.RetainedWith; import com.google.j2objc.annotations.Weak; import com.google.j2objc.annotations.WeakOuter; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractCollection; import java.util.AbstractMap; @@ -1646,7 +1647,7 @@ public String toString() { return "Maps.asConverter(" + bimap + ")"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0L; } /** @@ -1792,7 +1793,7 @@ public Set values() { return (result == null) ? values = Collections.unmodifiableSet(delegate.values()) : result; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/guava/src/com/google/common/collect/Multimaps.java b/guava/src/com/google/common/collect/Multimaps.java index 3d3ebef0a2db..8f3d491ea4c4 100644 --- a/guava/src/com/google/common/collect/Multimaps.java +++ b/guava/src/com/google/common/collect/Multimaps.java @@ -38,6 +38,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractCollection; import java.util.Collection; @@ -290,7 +291,7 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo setMap(map); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -374,7 +375,7 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo setMap(map); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -480,7 +481,7 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo setMap(map); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -572,7 +573,7 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo setMap(map); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -778,7 +779,7 @@ public Collection values() { return result; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static class UnmodifiableListMultimap< @@ -808,7 +809,7 @@ public List replaceValues(@ParametricNullness K key, Iterable va throw new UnsupportedOperationException(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static class UnmodifiableSetMultimap< @@ -847,7 +848,7 @@ public Set replaceValues(@ParametricNullness K key, Iterable val throw new UnsupportedOperationException(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static class UnmodifiableSortedSetMultimap< @@ -882,7 +883,7 @@ public SortedSet replaceValues(@ParametricNullness K key, Iterable left, Range right) { .result(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/RegularContiguousSet.java b/guava/src/com/google/common/collect/RegularContiguousSet.java index 26b5ce6e51df..59ef15585a12 100644 --- a/guava/src/com/google/common/collect/RegularContiguousSet.java +++ b/guava/src/com/google/common/collect/RegularContiguousSet.java @@ -25,6 +25,7 @@ import com.google.common.annotations.J2ktIncompatible; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import org.jspecify.annotations.Nullable; @@ -268,5 +269,5 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException throw new InvalidObjectException("Use SerializedForm"); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/RegularImmutableBiMap.java b/guava/src/com/google/common/collect/RegularImmutableBiMap.java index 88b4e026b434..567e206143f3 100644 --- a/guava/src/com/google/common/collect/RegularImmutableBiMap.java +++ b/guava/src/com/google/common/collect/RegularImmutableBiMap.java @@ -35,6 +35,7 @@ import com.google.j2objc.annotations.RetainedWith; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.util.function.BiConsumer; import java.util.function.Consumer; @@ -336,7 +337,7 @@ Object readResolve() { return forward.inverse(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } // redeclare to help optimizers with b/310253115 diff --git a/guava/src/com/google/common/collect/RegularImmutableMap.java b/guava/src/com/google/common/collect/RegularImmutableMap.java index 6b770ecbe35e..e331013fd68b 100644 --- a/guava/src/com/google/common/collect/RegularImmutableMap.java +++ b/guava/src/com/google/common/collect/RegularImmutableMap.java @@ -28,6 +28,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableMapEntry.NonTerminalImmutableMapEntry; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.io.Serializable; import java.util.IdentityHashMap; import java.util.function.BiConsumer; @@ -366,7 +367,7 @@ Object readResolve() { return map.keySet(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } @@ -422,7 +423,7 @@ Object readResolve() { return map.values(); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } @@ -437,5 +438,5 @@ Object writeReplace() { // This class is never actually serialized directly, but we have to make the // warning go away (and suppressing would suppress for all nested classes too) - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ReverseNaturalOrdering.java b/guava/src/com/google/common/collect/ReverseNaturalOrdering.java index f95f7e421305..afaf48a43ae3 100644 --- a/guava/src/com/google/common/collect/ReverseNaturalOrdering.java +++ b/guava/src/com/google/common/collect/ReverseNaturalOrdering.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Iterator; @@ -99,5 +100,5 @@ public String toString() { private ReverseNaturalOrdering() {} - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/ReverseOrdering.java b/guava/src/com/google/common/collect/ReverseOrdering.java index f8883ff1fcb4..3a0addecae41 100644 --- a/guava/src/com/google/common/collect/ReverseOrdering.java +++ b/guava/src/com/google/common/collect/ReverseOrdering.java @@ -21,6 +21,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.Iterator; import org.jspecify.annotations.Nullable; @@ -112,5 +113,5 @@ public String toString() { return forwardOrder + ".reverse()"; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/Sets.java b/guava/src/com/google/common/collect/Sets.java index b4114b836e75..9aa545412ea7 100644 --- a/guava/src/com/google/common/collect/Sets.java +++ b/guava/src/com/google/common/collect/Sets.java @@ -33,6 +33,7 @@ import com.google.errorprone.annotations.DoNotCall; import com.google.errorprone.annotations.InlineMe; import com.google.errorprone.annotations.concurrent.LazyInit; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractSet; import java.util.Arrays; @@ -1971,7 +1972,7 @@ public NavigableSet tailSet(@ParametricNullness E fromElement, boolean inclus return unmodifiableNavigableSet(delegate.tailSet(fromElement, inclusive)); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/guava/src/com/google/common/collect/StandardRowSortedTable.java b/guava/src/com/google/common/collect/StandardRowSortedTable.java index 2e0550f4ea08..5b899fa155eb 100644 --- a/guava/src/com/google/common/collect/StandardRowSortedTable.java +++ b/guava/src/com/google/common/collect/StandardRowSortedTable.java @@ -23,6 +23,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Supplier; import com.google.j2objc.annotations.WeakOuter; +import java.io.Serial; import java.util.Comparator; import java.util.Map; import java.util.Set; @@ -142,5 +143,5 @@ public SortedMap> tailMap(R fromKey) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/StandardTable.java b/guava/src/com/google/common/collect/StandardTable.java index b99f7b2845e7..e61ac58b79dc 100644 --- a/guava/src/com/google/common/collect/StandardTable.java +++ b/guava/src/com/google/common/collect/StandardTable.java @@ -41,6 +41,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.concurrent.LazyInit; import com.google.j2objc.annotations.WeakOuter; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; @@ -1023,5 +1024,5 @@ public boolean retainAll(Collection c) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/Synchronized.java b/guava/src/com/google/common/collect/Synchronized.java index e508ad326a29..2a9c9545c814 100644 --- a/guava/src/com/google/common/collect/Synchronized.java +++ b/guava/src/com/google/common/collect/Synchronized.java @@ -26,6 +26,7 @@ import com.google.j2objc.annotations.RetainedWith; import java.io.IOException; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Comparator; @@ -113,7 +114,7 @@ private void writeObject(ObjectOutputStream stream) throws IOException { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static Collection collection( @@ -259,7 +260,7 @@ public int size() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @VisibleForTesting @@ -296,7 +297,7 @@ public int hashCode() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static SortedSet sortedSet( @@ -357,7 +358,7 @@ public E last() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static List list(List list, @Nullable Object mutex) { @@ -474,7 +475,7 @@ public int hashCode() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static final class SynchronizedRandomAccessList @@ -483,7 +484,7 @@ static final class SynchronizedRandomAccessList super(list, mutex); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static Multiset multiset( @@ -580,7 +581,7 @@ public int hashCode() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static Multimap multimap( @@ -774,7 +775,7 @@ public int hashCode() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static ListMultimap listMultimap( @@ -818,7 +819,7 @@ public List replaceValues(K key, Iterable values) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static SetMultimap setMultimap( @@ -873,7 +874,7 @@ public Set> entries() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static @@ -925,7 +926,7 @@ public SortedSet replaceValues(K key, Iterable values) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } private static Collection typePreservingCollection( @@ -1048,7 +1049,7 @@ public boolean retainAll(Collection c) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @VisibleForTesting @@ -1267,7 +1268,7 @@ public int hashCode() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static SortedMap sortedMap( @@ -1329,7 +1330,7 @@ public SortedMap tailMap(K fromKey) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static BiMap biMap( @@ -1383,7 +1384,7 @@ public BiMap inverse() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static final class SynchronizedAsMap @@ -1429,7 +1430,7 @@ public boolean containsValue(@Nullable Object o) { return values().contains(o); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static final class SynchronizedAsMapValues @@ -1449,7 +1450,7 @@ Collection transform(Collection from) { }; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @GwtIncompatible // NavigableSet @@ -1564,7 +1565,7 @@ public SortedSet tailSet(E fromElement) { return tailSet(fromElement, true); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @GwtIncompatible // NavigableSet @@ -1767,7 +1768,7 @@ public SortedMap tailMap(K fromKey) { return tailMap(fromKey, true); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } @GwtIncompatible // works but is needed only for NavigableMap @@ -1829,7 +1830,7 @@ public V setValue(V value) { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static Queue queue(Queue queue, @Nullable Object mutex) { @@ -1883,7 +1884,7 @@ public E remove() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static Deque deque(Deque deque, @Nullable Object mutex) { @@ -2021,7 +2022,7 @@ public Iterator descendingIterator() { } } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } static diff --git a/guava/src/com/google/common/collect/Tables.java b/guava/src/com/google/common/collect/Tables.java index 8a40021fd3ac..015fa046196f 100644 --- a/guava/src/com/google/common/collect/Tables.java +++ b/guava/src/com/google/common/collect/Tables.java @@ -29,6 +29,7 @@ import com.google.common.base.Objects; import com.google.common.base.Supplier; import com.google.common.collect.Table.Cell; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.Collections; @@ -164,7 +165,7 @@ public V getValue() { return value; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } abstract static class AbstractCell< @@ -615,7 +616,7 @@ public Collection values() { return Collections.unmodifiableCollection(super.values()); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -665,7 +666,7 @@ public SortedSet rowKeySet() { return Collections.unmodifiableSortedSet(delegate().rowKeySet()); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/guava/src/com/google/common/collect/TreeBasedTable.java b/guava/src/com/google/common/collect/TreeBasedTable.java index 5bbc39351aba..1f674c795765 100644 --- a/guava/src/com/google/common/collect/TreeBasedTable.java +++ b/guava/src/com/google/common/collect/TreeBasedTable.java @@ -27,6 +27,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Supplier; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; import java.util.Iterator; @@ -86,7 +87,7 @@ public Map get() { return new TreeMap<>(comparator); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** @@ -335,5 +336,5 @@ Iterator createColumnKeyIterator() { }; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/TreeMultimap.java b/guava/src/com/google/common/collect/TreeMultimap.java index 11509a091368..529af9383e43 100644 --- a/guava/src/com/google/common/collect/TreeMultimap.java +++ b/guava/src/com/google/common/collect/TreeMultimap.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.Collection; import java.util.Comparator; import java.util.Map; @@ -225,5 +226,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMultimap(this, stream); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/TreeMultiset.java b/guava/src/com/google/common/collect/TreeMultiset.java index 0841e691c184..b96ca34ce905 100644 --- a/guava/src/com/google/common/collect/TreeMultiset.java +++ b/guava/src/com/google/common/collect/TreeMultiset.java @@ -33,6 +33,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; import java.util.ConcurrentModificationException; @@ -1091,5 +1092,5 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo Serialization.populateMultiset(this, stream); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } diff --git a/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java b/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java index 0b602c1d0eb2..50b44708065c 100644 --- a/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java +++ b/guava/src/com/google/common/collect/UnmodifiableSortedMultiset.java @@ -23,6 +23,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.collect.Multisets.UnmodifiableMultiset; import com.google.errorprone.annotations.concurrent.LazyInit; +import java.io.Serial; import java.util.Comparator; import java.util.NavigableSet; import org.jspecify.annotations.Nullable; @@ -114,5 +115,5 @@ public SortedMultiset tailMultiset(@ParametricNullness E lowerBound, BoundTyp return Multisets.unmodifiableSortedMultiset(delegate().tailMultiset(lowerBound, boundType)); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/collect/UsingToStringOrdering.java b/guava/src/com/google/common/collect/UsingToStringOrdering.java index 7839aff833c2..b3f6b42e62a2 100644 --- a/guava/src/com/google/common/collect/UsingToStringOrdering.java +++ b/guava/src/com/google/common/collect/UsingToStringOrdering.java @@ -19,6 +19,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; /** An ordering that uses the natural order of the string representation of the values. */ @@ -43,5 +44,5 @@ public String toString() { private UsingToStringOrdering() {} - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/hash/AbstractCompositeHashFunction.java b/guava/src/com/google/common/hash/AbstractCompositeHashFunction.java index 15ce417441df..a816101778ca 100644 --- a/guava/src/com/google/common/hash/AbstractCompositeHashFunction.java +++ b/guava/src/com/google/common/hash/AbstractCompositeHashFunction.java @@ -18,6 +18,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.errorprone.annotations.Immutable; +import java.io.Serial; import java.nio.ByteBuffer; import java.nio.charset.Charset; import org.jspecify.annotations.Nullable; @@ -193,5 +194,5 @@ public HashCode hash() { }; } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/guava/src/com/google/common/hash/BloomFilter.java b/guava/src/com/google/common/hash/BloomFilter.java index f70cbee8bf60..ad276a429bc3 100644 --- a/guava/src/com/google/common/hash/BloomFilter.java +++ b/guava/src/com/google/common/hash/BloomFilter.java @@ -36,6 +36,7 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.OutputStream; +import java.io.Serial; import java.io.Serializable; import java.math.RoundingMode; import java.util.stream.Collector; @@ -566,7 +567,7 @@ Object readResolve() { return new BloomFilter(new LockFreeBitArray(data), numHashFunctions, funnel, strategy); } - private static final long serialVersionUID = 1; + @Serial private static final long serialVersionUID = 1; } /** @@ -647,5 +648,5 @@ public void writeTo(OutputStream out) throws IOException { } } - private static final long serialVersionUID = 0xcafebabe; + @Serial private static final long serialVersionUID = 0xcafebabe; } diff --git a/guava/src/com/google/common/hash/ChecksumHashFunction.java b/guava/src/com/google/common/hash/ChecksumHashFunction.java index ad613eba2158..ea0914cf6c2c 100644 --- a/guava/src/com/google/common/hash/ChecksumHashFunction.java +++ b/guava/src/com/google/common/hash/ChecksumHashFunction.java @@ -20,6 +20,7 @@ import com.google.errorprone.annotations.Immutable; import com.google.j2objc.annotations.J2ObjCIncompatible; +import java.io.Serial; import java.io.Serializable; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -145,5 +146,5 @@ private static LinkageError newLinkageError(Throwable cause) { } } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/guava/src/com/google/common/hash/Funnels.java b/guava/src/com/google/common/hash/Funnels.java index 2557e9c2bb80..8cdace3d49b9 100644 --- a/guava/src/com/google/common/hash/Funnels.java +++ b/guava/src/com/google/common/hash/Funnels.java @@ -19,6 +19,7 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.OutputStream; +import java.io.Serial; import java.io.Serializable; import java.nio.charset.Charset; import org.jspecify.annotations.Nullable; @@ -137,7 +138,7 @@ private Object readResolve() { return stringFunnel(Charset.forName(charsetCanonicalName)); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } } diff --git a/guava/src/com/google/common/hash/HashCode.java b/guava/src/com/google/common/hash/HashCode.java index 6d5d9adc5565..560e41942ef9 100644 --- a/guava/src/com/google/common/hash/HashCode.java +++ b/guava/src/com/google/common/hash/HashCode.java @@ -22,6 +22,7 @@ import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedInts; import com.google.errorprone.annotations.CanIgnoreReturnValue; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -159,7 +160,7 @@ boolean equalsSameBits(HashCode that) { return hash == that.asInt(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } /** @@ -225,7 +226,7 @@ boolean equalsSameBits(HashCode that) { return hash == that.asLong(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } /** @@ -319,7 +320,7 @@ boolean equalsSameBits(HashCode that) { return areEqual; } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } /** diff --git a/guava/src/com/google/common/hash/MessageDigestHashFunction.java b/guava/src/com/google/common/hash/MessageDigestHashFunction.java index 9a435b9edc13..e8c0b7c33bd6 100644 --- a/guava/src/com/google/common/hash/MessageDigestHashFunction.java +++ b/guava/src/com/google/common/hash/MessageDigestHashFunction.java @@ -21,6 +21,7 @@ import com.google.errorprone.annotations.Immutable; import java.io.InvalidObjectException; import java.io.ObjectInputStream; +import java.io.Serial; import java.io.Serializable; import java.nio.ByteBuffer; import java.security.MessageDigest; @@ -114,7 +115,7 @@ private Object readResolve() { return new MessageDigestHashFunction(algorithmName, bytes, toString); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } Object writeReplace() { diff --git a/guava/src/com/google/common/hash/Murmur3_128HashFunction.java b/guava/src/com/google/common/hash/Murmur3_128HashFunction.java index 3ce78e8614c6..01ce2c58d395 100644 --- a/guava/src/com/google/common/hash/Murmur3_128HashFunction.java +++ b/guava/src/com/google/common/hash/Murmur3_128HashFunction.java @@ -28,6 +28,7 @@ import static com.google.common.primitives.UnsignedBytes.toInt; import com.google.errorprone.annotations.Immutable; +import java.io.Serial; import java.io.Serializable; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -212,5 +213,5 @@ private static long mixK2(long k2) { } } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/guava/src/com/google/common/hash/Murmur3_32HashFunction.java b/guava/src/com/google/common/hash/Murmur3_32HashFunction.java index b04dd22f0b07..38ce10a94091 100644 --- a/guava/src/com/google/common/hash/Murmur3_32HashFunction.java +++ b/guava/src/com/google/common/hash/Murmur3_32HashFunction.java @@ -35,6 +35,7 @@ import com.google.common.primitives.Longs; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.Immutable; +import java.io.Serial; import java.io.Serializable; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -424,5 +425,5 @@ private static long charToTwoUtf8Bytes(char c) { return ((0x3L << 6) | (c >>> 6)) | ((0x80 | (0x3F & c)) << 8); } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/guava/src/com/google/common/hash/SipHashFunction.java b/guava/src/com/google/common/hash/SipHashFunction.java index a5f328c3f3fc..0f10ed272cde 100644 --- a/guava/src/com/google/common/hash/SipHashFunction.java +++ b/guava/src/com/google/common/hash/SipHashFunction.java @@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.errorprone.annotations.Immutable; +import java.io.Serial; import java.io.Serializable; import java.nio.ByteBuffer; import org.jspecify.annotations.Nullable; @@ -180,5 +181,5 @@ private void sipRound(int iterations) { } } - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; } diff --git a/guava/src/com/google/common/math/PairedStats.java b/guava/src/com/google/common/math/PairedStats.java index 5985f8498651..9672c8c7cc28 100644 --- a/guava/src/com/google/common/math/PairedStats.java +++ b/guava/src/com/google/common/math/PairedStats.java @@ -25,6 +25,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import java.io.Serial; import java.io.Serializable; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -315,5 +316,5 @@ public static PairedStats fromByteArray(byte[] byteArray) { return new PairedStats(xStats, yStats, sumOfProductsOfDeltas); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/math/Stats.java b/guava/src/com/google/common/math/Stats.java index aceeff564c3d..4a1727ed7788 100644 --- a/guava/src/com/google/common/math/Stats.java +++ b/guava/src/com/google/common/math/Stats.java @@ -28,6 +28,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.MoreObjects; import com.google.common.base.Objects; +import java.io.Serial; import java.io.Serializable; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -659,5 +660,5 @@ static Stats readFrom(ByteBuffer buffer) { buffer.getDouble()); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/net/HostAndPort.java b/guava/src/com/google/common/net/HostAndPort.java index 78b1a392ee38..2fb3eb3ced9d 100644 --- a/guava/src/com/google/common/net/HostAndPort.java +++ b/guava/src/com/google/common/net/HostAndPort.java @@ -26,6 +26,7 @@ import com.google.common.base.Strings; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.Immutable; +import java.io.Serial; import java.io.Serializable; import org.jspecify.annotations.Nullable; @@ -319,5 +320,5 @@ private static boolean isValidPort(int port) { return port >= 0 && port <= 65535; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/primitives/Booleans.java b/guava/src/com/google/common/primitives/Booleans.java index 211936da04f0..b225ae4e691f 100644 --- a/guava/src/com/google/common/primitives/Booleans.java +++ b/guava/src/com/google/common/primitives/Booleans.java @@ -24,6 +24,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -514,7 +515,7 @@ boolean[] toBooleanArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/guava/src/com/google/common/primitives/Bytes.java b/guava/src/com/google/common/primitives/Bytes.java index e9ececf2c8a4..766454b99418 100644 --- a/guava/src/com/google/common/primitives/Bytes.java +++ b/guava/src/com/google/common/primitives/Bytes.java @@ -22,6 +22,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -376,7 +377,7 @@ byte[] toByteArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/guava/src/com/google/common/primitives/Chars.java b/guava/src/com/google/common/primitives/Chars.java index b728466c9b8c..a82511aa026f 100644 --- a/guava/src/com/google/common/primitives/Chars.java +++ b/guava/src/com/google/common/primitives/Chars.java @@ -23,6 +23,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -696,6 +697,6 @@ char[] toCharArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/guava/src/com/google/common/primitives/Doubles.java b/guava/src/com/google/common/primitives/Doubles.java index d4dc53323cff..7839548c4590 100644 --- a/guava/src/com/google/common/primitives/Doubles.java +++ b/guava/src/com/google/common/primitives/Doubles.java @@ -27,6 +27,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Converter; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -323,7 +324,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } /** @@ -717,7 +718,7 @@ public String toString() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/guava/src/com/google/common/primitives/Floats.java b/guava/src/com/google/common/primitives/Floats.java index ad7d83101cbd..0539793ecfbe 100644 --- a/guava/src/com/google/common/primitives/Floats.java +++ b/guava/src/com/google/common/primitives/Floats.java @@ -27,6 +27,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Converter; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -318,7 +319,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } /** @@ -703,7 +704,7 @@ float[] toFloatArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/guava/src/com/google/common/primitives/Ints.java b/guava/src/com/google/common/primitives/Ints.java index bf665e20ee8c..a4074be150c8 100644 --- a/guava/src/com/google/common/primitives/Ints.java +++ b/guava/src/com/google/common/primitives/Ints.java @@ -24,6 +24,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Converter; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -375,7 +376,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } /** @@ -787,7 +788,7 @@ int[] toIntArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } /** diff --git a/guava/src/com/google/common/primitives/Longs.java b/guava/src/com/google/common/primitives/Longs.java index 08d1b0b78c66..eafa434c3f8b 100644 --- a/guava/src/com/google/common/primitives/Longs.java +++ b/guava/src/com/google/common/primitives/Longs.java @@ -24,6 +24,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Converter; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -465,7 +466,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } /** @@ -850,6 +851,6 @@ long[] toLongArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/guava/src/com/google/common/primitives/Shorts.java b/guava/src/com/google/common/primitives/Shorts.java index 9af7d3918e96..7d3901fed2f2 100644 --- a/guava/src/com/google/common/primitives/Shorts.java +++ b/guava/src/com/google/common/primitives/Shorts.java @@ -24,6 +24,7 @@ import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Converter; import com.google.errorprone.annotations.InlineMe; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractList; import java.util.Arrays; @@ -368,7 +369,7 @@ private Object readResolve() { return INSTANCE; } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 1; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 1; } /** @@ -746,6 +747,6 @@ short[] toShortArray() { return Arrays.copyOfRange(array, start, end); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } } diff --git a/guava/src/com/google/common/reflect/TypeToken.java b/guava/src/com/google/common/reflect/TypeToken.java index 77d613eb66f9..8f2ed0bcc1c2 100644 --- a/guava/src/com/google/common/reflect/TypeToken.java +++ b/guava/src/com/google/common/reflect/TypeToken.java @@ -33,6 +33,7 @@ import com.google.common.primitives.Primitives; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.concurrent.LazyInit; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Constructor; import java.lang.reflect.GenericArrayType; @@ -708,7 +709,7 @@ public Set> rawTypes() { return ImmutableSet.copyOf(collectedTypes); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } private final class InterfaceSet extends TypeSet { @@ -754,7 +755,7 @@ private Object readResolve() { return getTypes().interfaces(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } private final class ClassSet extends TypeSet { @@ -801,7 +802,7 @@ private Object readResolve() { return getTypes().classes(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } private enum TypeFilter implements Predicate> { @@ -1306,7 +1307,7 @@ private static final class SimpleTypeToken extends TypeToken { super(type); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } /** @@ -1459,5 +1460,5 @@ Iterable getInterfaces(K type) { // This happens to be the hash of the class as of now. So setting it makes a backward compatible // change. Going forward, if any incompatible change is added, we can change the UID back to 1. - private static final long serialVersionUID = 3637540370352322684L; + @Serial private static final long serialVersionUID = 3637540370352322684L; } diff --git a/guava/src/com/google/common/reflect/Types.java b/guava/src/com/google/common/reflect/Types.java index 0e9885168472..f13923ad647f 100644 --- a/guava/src/com/google/common/reflect/Types.java +++ b/guava/src/com/google/common/reflect/Types.java @@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Array; @@ -244,7 +245,7 @@ public boolean equals(@Nullable Object obj) { return false; } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } private static final class ParameterizedTypeImpl implements ParameterizedType, Serializable { @@ -309,7 +310,7 @@ public boolean equals(@Nullable Object other) { && Arrays.equals(getActualTypeArguments(), that.getActualTypeArguments()); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } private static TypeVariable newTypeVariableImpl( @@ -506,7 +507,7 @@ public String toString() { return builder.toString(); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; } private static Type[] toArray(Collection types) { diff --git a/guava/src/com/google/common/util/concurrent/AtomicDouble.java b/guava/src/com/google/common/util/concurrent/AtomicDouble.java index 80cb9007a5af..e6c4aeb86846 100644 --- a/guava/src/com/google/common/util/concurrent/AtomicDouble.java +++ b/guava/src/com/google/common/util/concurrent/AtomicDouble.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.util.concurrent.atomic.AtomicLongFieldUpdater; import java.util.function.DoubleBinaryOperator; import java.util.function.DoubleUnaryOperator; @@ -62,7 +63,7 @@ @J2ktIncompatible @ReflectionSupport(value = ReflectionSupport.Level.FULL) public class AtomicDouble extends Number { - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; private transient volatile long value; diff --git a/guava/src/com/google/common/util/concurrent/AtomicDoubleArray.java b/guava/src/com/google/common/util/concurrent/AtomicDoubleArray.java index a9eee194c8dd..cc53da8eb7d5 100644 --- a/guava/src/com/google/common/util/concurrent/AtomicDoubleArray.java +++ b/guava/src/com/google/common/util/concurrent/AtomicDoubleArray.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serial; import java.io.Serializable; import java.util.concurrent.atomic.AtomicLongArray; import java.util.function.DoubleBinaryOperator; @@ -54,7 +55,7 @@ @GwtIncompatible @J2ktIncompatible public class AtomicDoubleArray implements Serializable { - private static final long serialVersionUID = 0L; + @Serial private static final long serialVersionUID = 0L; // Making this non-final is the lesser evil according to Effective // Java 2nd Edition Item 76: Write readObject methods defensively. diff --git a/guava/src/com/google/common/util/concurrent/ExecutionError.java b/guava/src/com/google/common/util/concurrent/ExecutionError.java index 48c20bf81eab..6e870185270d 100644 --- a/guava/src/com/google/common/util/concurrent/ExecutionError.java +++ b/guava/src/com/google/common/util/concurrent/ExecutionError.java @@ -17,6 +17,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import org.jspecify.annotations.Nullable; /** @@ -86,5 +87,5 @@ public ExecutionError(@Nullable Error cause) { super(cause); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java b/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java index 93424486c0d5..3dba140bedfd 100644 --- a/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java +++ b/guava/src/com/google/common/util/concurrent/UncheckedExecutionException.java @@ -17,6 +17,7 @@ import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import org.jspecify.annotations.Nullable; /** @@ -91,5 +92,5 @@ public UncheckedExecutionException(@Nullable Throwable cause) { super(cause); } - @GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0; + @GwtIncompatible @J2ktIncompatible @Serial private static final long serialVersionUID = 0; } diff --git a/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java b/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java index 375b712028ee..3ace798412ef 100644 --- a/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java +++ b/guava/src/com/google/common/util/concurrent/UncheckedTimeoutException.java @@ -16,6 +16,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; +import java.io.Serial; import org.jspecify.annotations.Nullable; /** @@ -41,5 +42,5 @@ public UncheckedTimeoutException(@Nullable String message, @Nullable Throwable c super(message, cause); } - private static final long serialVersionUID = 0; + @Serial private static final long serialVersionUID = 0; }