archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8229997: Apply java.io.Serial annotations in java.base

Browse source 
Reviewed-by: alanb, rriggs
This commit is contained in:
Joe Darcy 2019-08-29 16:31:34 -07:00
parent 6d064a747e
commit 9d764ee48e
315 changed files with 880 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/java/util/AbstractMap.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -604,6 +604,7 @@ public abstract class AbstractMap<K,V> implements Map<K,V> {
public static class SimpleEntry<K,V>
implements Entry<K,V>, java.io.Serializable
{
@java.io.Serial
private static final long serialVersionUID = -8499721149061103585L;
private final K key;
@ -734,6 +735,7 @@ public abstract class AbstractMap<K,V> implements Map<K,V> {
public static class SimpleImmutableEntry<K,V>
implements Entry<K,V>, java.io.Serializable
{
@java.io.Serial
private static final long serialVersionUID = 7138329143949025153L;
private final K key;

3
src/java.base/share/classes/java/util/ArrayDeque.java
View file

@ -1157,6 +1157,7 @@ public class ArrayDeque<E> extends AbstractCollection<E>
}
}
@java.io.Serial
private static final long serialVersionUID = 2340985798034038923L;
/**
@ -1168,6 +1169,7 @@ public class ArrayDeque<E> extends AbstractCollection<E>
* followed by all of its elements (each an object reference) in
* first-to-last order.
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException {
s.defaultWriteObject();
@ -1192,6 +1194,7 @@ public class ArrayDeque<E> extends AbstractCollection<E>
* could not be found
* @throws java.io.IOException if an I/O error occurs
*/
@java.io.Serial
private void readObject(java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException {
s.defaultReadObject();

3
src/java.base/share/classes/java/util/ArrayList.java
View file

@ -109,6 +109,7 @@ import jdk.internal.util.ArraysSupport;
public class ArrayList<E> extends AbstractList<E>
implements List<E>, RandomAccess, Cloneable, java.io.Serializable
{
@java.io.Serial
private static final long serialVersionUID = 8683452581122892189L;
/**
@ -849,6 +850,7 @@ public class ArrayList<E> extends AbstractList<E>
* instance is emitted (int), followed by all of its elements
* (each an {@code Object}) in the proper order.
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException {
// Write out element count, and any hidden stuff
@ -876,6 +878,7 @@ public class ArrayList<E> extends AbstractList<E>
* could not be found
* @throws java.io.IOException if an I/O error occurs
*/
@java.io.Serial
private void readObject(java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException {

4
src/java.base/share/classes/java/util/ArrayPrefixHelpers.java
View file

@ -251,6 +251,7 @@ class ArrayPrefixHelpers {
}
}
}
@java.io.Serial
private static final long serialVersionUID = 5293554502939613543L;
}
@ -401,6 +402,7 @@ class ArrayPrefixHelpers {
}
}
}
@java.io.Serial
private static final long serialVersionUID = -5074099945909284273L;
}
@ -551,6 +553,7 @@ class ArrayPrefixHelpers {
}
}
}
@java.io.Serial
private static final long serialVersionUID = -586947823794232033L;
}
@ -701,6 +704,7 @@ class ArrayPrefixHelpers {
}
}
}
@java.io.Serial
private static final long serialVersionUID = 3731755594596840961L;
}
}

3
src/java.base/share/classes/java/util/Arrays.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -4337,6 +4337,7 @@ public class Arrays {
private static class ArrayList<E> extends AbstractList<E>
implements RandomAccess, java.io.Serializable
{
@java.io.Serial
private static final long serialVersionUID = -2764017481108945198L;
private final E[] a;

20
src/java.base/share/classes/java/util/ArraysParallelSortHelpers.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -87,6 +87,7 @@ import java.util.concurrent.CountedCompleter;
* quartile task, that does not need to maintain array state.
*/
static final class EmptyCompleter extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
EmptyCompleter(CountedCompleter<?> p) { super(p); }
public final void compute() { }
@ -96,6 +97,7 @@ import java.util.concurrent.CountedCompleter;
* A trigger for secondary merge of two merges
*/
static final class Relay extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final CountedCompleter<?> task;
Relay(CountedCompleter<?> task) {
@ -111,6 +113,7 @@ import java.util.concurrent.CountedCompleter;
/** Object + Comparator support class */
static final class FJObject {
static final class Sorter<T> extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final T[] a, w;
final int base, size, wbase, gran;
@ -148,6 +151,7 @@ import java.util.concurrent.CountedCompleter;
}
static final class Merger<T> extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final T[] a, w; // main and workspace arrays
final int lbase, lsize, rbase, rsize, wbase, gran;
@ -233,6 +237,7 @@ import java.util.concurrent.CountedCompleter;
/** byte support class */
static final class FJByte {
static final class Sorter extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final byte[] a, w;
final int base, size, wbase, gran;
@ -266,6 +271,7 @@ import java.util.concurrent.CountedCompleter;
}
static final class Merger extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final byte[] a, w; // main and workspace arrays
final int lbase, lsize, rbase, rsize, wbase, gran;
@ -344,6 +350,7 @@ import java.util.concurrent.CountedCompleter;
/** char support class */
static final class FJChar {
static final class Sorter extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final char[] a, w;
final int base, size, wbase, gran;
@ -377,6 +384,7 @@ import java.util.concurrent.CountedCompleter;
}
static final class Merger extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final char[] a, w; // main and workspace arrays
final int lbase, lsize, rbase, rsize, wbase, gran;
@ -455,6 +463,7 @@ import java.util.concurrent.CountedCompleter;
/** short support class */
static final class FJShort {
static final class Sorter extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final short[] a, w;
final int base, size, wbase, gran;
@ -488,6 +497,7 @@ import java.util.concurrent.CountedCompleter;
}
static final class Merger extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final short[] a, w; // main and workspace arrays
final int lbase, lsize, rbase, rsize, wbase, gran;
@ -566,6 +576,7 @@ import java.util.concurrent.CountedCompleter;
/** int support class */
static final class FJInt {
static final class Sorter extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final int[] a, w;
final int base, size, wbase, gran;
@ -599,6 +610,7 @@ import java.util.concurrent.CountedCompleter;
}
static final class Merger extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final int[] a, w; // main and workspace arrays
final int lbase, lsize, rbase, rsize, wbase, gran;
@ -677,6 +689,7 @@ import java.util.concurrent.CountedCompleter;
/** long support class */
static final class FJLong {
static final class Sorter extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final long[] a, w;
final int base, size, wbase, gran;
@ -710,6 +723,7 @@ import java.util.concurrent.CountedCompleter;
}
static final class Merger extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final long[] a, w; // main and workspace arrays
final int lbase, lsize, rbase, rsize, wbase, gran;
@ -788,6 +802,7 @@ import java.util.concurrent.CountedCompleter;
/** float support class */
static final class FJFloat {
static final class Sorter extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final float[] a, w;
final int base, size, wbase, gran;
@ -821,6 +836,7 @@ import java.util.concurrent.CountedCompleter;
}
static final class Merger extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final float[] a, w; // main and workspace arrays
final int lbase, lsize, rbase, rsize, wbase, gran;
@ -899,6 +915,7 @@ import java.util.concurrent.CountedCompleter;
/** double support class */
static final class FJDouble {
static final class Sorter extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final double[] a, w;
final int base, size, wbase, gran;
@ -932,6 +949,7 @@ import java.util.concurrent.CountedCompleter;
}
static final class Merger extends CountedCompleter<Void> {
@java.io.Serial
static final long serialVersionUID = 2446542900576103244L;
final double[] a, w; // main and workspace arrays
final int lbase, lsize, rbase, rsize, wbase, gran;

4
src/java.base/share/classes/java/util/BitSet.java
View file

@ -83,6 +83,7 @@ public class BitSet implements Cloneable, java.io.Serializable {
* bit position i % 64 (where bit position 0 refers to the least
* significant bit and 63 refers to the most significant bit).
*/
@java.io.Serial
private static final ObjectStreamField[] serialPersistentFields = {
new ObjectStreamField("bits", long[].class),
};
@ -104,6 +105,7 @@ public class BitSet implements Cloneable, java.io.Serializable {
private transient boolean sizeIsSticky = false;
/* use serialVersionUID from JDK 1.0.2 for interoperability */
@java.io.Serial
private static final long serialVersionUID = 7997698588986878753L;
/**
@ -1124,6 +1126,7 @@ public class BitSet implements Cloneable, java.io.Serializable {
* Save the state of the {@code BitSet} instance to a stream (i.e.,
* serialize it).
*/
@java.io.Serial
private void writeObject(ObjectOutputStream s)
throws IOException {
@ -1141,6 +1144,7 @@ public class BitSet implements Cloneable, java.io.Serializable {
* Reconstitute the {@code BitSet} instance from a stream (i.e.,
* deserialize it).
*/
@java.io.Serial
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {

3
src/java.base/share/classes/java/util/Calendar.java
View file

@ -1005,6 +1005,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
private int serialVersionOnStream = currentSerialVersion;
// Proclaim serialization compatibility with JDK 1.1
@java.io.Serial
static final long serialVersionUID = -1807547505821590642L;
// Mask values for calendar fields
@ -3526,6 +3527,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
* removed from the serialization stream; this will probably happen in the
* near future.
*/
@java.io.Serial
private synchronized void writeObject(ObjectOutputStream stream)
throws IOException
{
@ -3580,6 +3582,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
/**
* Reconstitutes this object from a stream (i.e., deserialize it).
*/
@java.io.Serial
private void readObject(ObjectInputStream stream)
throws IOException, ClassNotFoundException
{

56
src/java.base/share/classes/java/util/Collections.java
View file

@ -1021,6 +1021,7 @@ public class Collections {
* @serial include
*/
static class UnmodifiableCollection<E> implements Collection<E>, Serializable {
@java.io.Serial
private static final long serialVersionUID = 1820017752578914078L;
final Collection<? extends E> c;
@ -1127,6 +1128,7 @@ public class Collections {
*/
static class UnmodifiableSet<E> extends UnmodifiableCollection<E>
implements Set<E>, Serializable {
@java.io.Serial
private static final long serialVersionUID = -9215047833775013803L;
UnmodifiableSet(Set<? extends E> s) {super(s);}
@ -1160,6 +1162,7 @@ public class Collections {
static class UnmodifiableSortedSet<E>
extends UnmodifiableSet<E>
implements SortedSet<E>, Serializable {
@java.io.Serial
private static final long serialVersionUID = -4929149591599911165L;
private final SortedSet<E> ss;
@ -1212,6 +1215,7 @@ public class Collections {
extends UnmodifiableSortedSet<E>
implements NavigableSet<E>, Serializable {
@java.io.Serial
private static final long serialVersionUID = -6027448201786391929L;
/**
@ -1222,12 +1226,14 @@ public class Collections {
*/
private static class EmptyNavigableSet<E> extends UnmodifiableNavigableSet<E>
implements Serializable {
@java.io.Serial
private static final long serialVersionUID = -6291252904449939134L;
public EmptyNavigableSet() {
super(new TreeSet<>());
}
@java.io.Serial
private Object readResolve() { return EMPTY_NAVIGABLE_SET; }
}
@ -1295,6 +1301,7 @@ public class Collections {
*/
static class UnmodifiableList<E> extends UnmodifiableCollection<E>
implements List<E> {
@java.io.Serial
private static final long serialVersionUID = -283967356065247728L;
final List<? extends E> list;
@ -1379,6 +1386,7 @@ public class Collections {
* serialized in 1.4.1 and deserialized in 1.4 will become
* UnmodifiableList instances, as this method was missing in 1.4.
*/
@java.io.Serial
private Object readResolve() {
return (list instanceof RandomAccess
? new UnmodifiableRandomAccessList<>(list)
@ -1401,6 +1409,7 @@ public class Collections {
list.subList(fromIndex, toIndex));
}
@java.io.Serial
private static final long serialVersionUID = -2542308836966382001L;
/**
@ -1409,6 +1418,7 @@ public class Collections {
* a readResolve method that inverts this transformation upon
* deserialization.
*/
@java.io.Serial
private Object writeReplace() {
return new UnmodifiableList<>(list);
}
@ -1437,6 +1447,7 @@ public class Collections {
* @serial include
*/
private static class UnmodifiableMap<K,V> implements Map<K,V>, Serializable {
@java.io.Serial
private static final long serialVersionUID = -1034234728574286014L;
private final Map<? extends K, ? extends V> m;
@ -1563,6 +1574,7 @@ public class Collections {
*/
static class UnmodifiableEntrySet<K,V>
extends UnmodifiableSet<Map.Entry<K,V>> {
@java.io.Serial
private static final long serialVersionUID = 7854390611657943733L;
@SuppressWarnings({"unchecked", "rawtypes"})
@ -1794,6 +1806,7 @@ public class Collections {
static class UnmodifiableSortedMap<K,V>
extends UnmodifiableMap<K,V>
implements SortedMap<K,V>, Serializable {
@java.io.Serial
private static final long serialVersionUID = -8806743815996713206L;
private final SortedMap<K, ? extends V> sm;
@ -1838,6 +1851,7 @@ public class Collections {
static class UnmodifiableNavigableMap<K,V>
extends UnmodifiableSortedMap<K,V>
implements NavigableMap<K,V>, Serializable {
@java.io.Serial
private static final long serialVersionUID = -4858195264774772197L;
/**
@ -1850,6 +1864,7 @@ public class Collections {
private static class EmptyNavigableMap<K,V> extends UnmodifiableNavigableMap<K,V>
implements Serializable {
@java.io.Serial
private static final long serialVersionUID = -2239321462712562324L;
EmptyNavigableMap() { super(new TreeMap<>()); }
@ -1858,6 +1873,7 @@ public class Collections {
public NavigableSet<K> navigableKeySet()
{ return emptyNavigableSet(); }
@java.io.Serial
private Object readResolve() { return EMPTY_NAVIGABLE_MAP; }
}
@ -1998,6 +2014,7 @@ public class Collections {
* @serial include
*/
static class SynchronizedCollection<E> implements Collection<E>, Serializable {
@java.io.Serial
private static final long serialVersionUID = 3053995032091335093L;
final Collection<E> c; // Backing Collection
@ -2082,6 +2099,7 @@ public class Collections {
public Stream<E> parallelStream() {
return c.parallelStream(); // Must be manually synched by user!
}
@java.io.Serial
private void writeObject(ObjectOutputStream s) throws IOException {
synchronized (mutex) {s.defaultWriteObject();}
}
@ -2128,6 +2146,7 @@ public class Collections {
static class SynchronizedSet<E>
extends SynchronizedCollection<E>
implements Set<E> {
@java.io.Serial
private static final long serialVersionUID = 487447009682186044L;
SynchronizedSet(Set<E> s) {
@ -2197,6 +2216,7 @@ public class Collections {
extends SynchronizedSet<E>
implements SortedSet<E>
{
@java.io.Serial
private static final long serialVersionUID = 8695801310862127406L;
private final SortedSet<E> ss;
@ -2291,6 +2311,7 @@ public class Collections {
extends SynchronizedSortedSet<E>
implements NavigableSet<E>
{
@java.io.Serial
private static final long serialVersionUID = -5505529816273629798L;
private final NavigableSet<E> ns;
@ -2400,6 +2421,7 @@ public class Collections {
static class SynchronizedList<E>
extends SynchronizedCollection<E>
implements List<E> {
@java.io.Serial
private static final long serialVersionUID = -7754090372962971524L;
final List<E> list;
@ -2482,6 +2504,7 @@ public class Collections {
* serialized in 1.4.1 and deserialized in 1.4 will become
* SynchronizedList instances, as this method was missing in 1.4.
*/
@java.io.Serial
private Object readResolve() {
return (list instanceof RandomAccess
? new SynchronizedRandomAccessList<>(list)
@ -2511,6 +2534,7 @@ public class Collections {
}
}
@java.io.Serial
private static final long serialVersionUID = 1530674583602358482L;
/**
@ -2519,6 +2543,7 @@ public class Collections {
* a readResolve method that inverts this transformation upon
* deserialization.
*/
@java.io.Serial
private Object writeReplace() {
return new SynchronizedList<>(list);
}
@ -2563,6 +2588,7 @@ public class Collections {
*/
private static class SynchronizedMap<K,V>
implements Map<K,V>, Serializable {
@java.io.Serial
private static final long serialVersionUID = 1978198479659022715L;
private final Map<K,V> m; // Backing Map
@ -2697,6 +2723,7 @@ public class Collections {
synchronized (mutex) {return m.merge(key, value, remappingFunction);}
}
@java.io.Serial
private void writeObject(ObjectOutputStream s) throws IOException {
synchronized (mutex) {s.defaultWriteObject();}
}
@ -2758,6 +2785,7 @@ public class Collections {
extends SynchronizedMap<K,V>
implements SortedMap<K,V>
{
@java.io.Serial
private static final long serialVersionUID = -8798146769416483793L;
private final SortedMap<K,V> sm;
@ -2860,6 +2888,7 @@ public class Collections {
extends SynchronizedSortedMap<K,V>
implements NavigableMap<K,V>
{
@java.io.Serial
private static final long serialVersionUID = 699392247599746807L;
private final NavigableMap<K,V> nm;
@ -3038,6 +3067,7 @@ public class Collections {
* @serial include
*/
static class CheckedCollection<E> implements Collection<E>, Serializable {
@java.io.Serial
private static final long serialVersionUID = 1578914078182001775L;
final Collection<E> c;
@ -3187,6 +3217,7 @@ public class Collections {
extends CheckedCollection<E>
implements Queue<E>, Serializable
{
@java.io.Serial
private static final long serialVersionUID = 1433151992604707767L;
final Queue<E> queue;
@ -3241,6 +3272,7 @@ public class Collections {
static class CheckedSet<E> extends CheckedCollection<E>
implements Set<E>, Serializable
{
@java.io.Serial
private static final long serialVersionUID = 4694047833775013803L;
CheckedSet(Set<E> s, Class<E> elementType) { super(s, elementType); }
@ -3288,6 +3320,7 @@ public class Collections {
static class CheckedSortedSet<E> extends CheckedSet<E>
implements SortedSet<E>, Serializable
{
@java.io.Serial
private static final long serialVersionUID = 1599911165492914959L;
private final SortedSet<E> ss;
@ -3351,6 +3384,7 @@ public class Collections {
static class CheckedNavigableSet<E> extends CheckedSortedSet<E>
implements NavigableSet<E>, Serializable
{
@java.io.Serial
private static final long serialVersionUID = -5429120189805438922L;
private final NavigableSet<E> ns;
@ -3434,6 +3468,7 @@ public class Collections {
extends CheckedCollection<E>
implements List<E>
{
@java.io.Serial
private static final long serialVersionUID = 65247728283967356L;
final List<E> list;
@ -3519,6 +3554,7 @@ public class Collections {
static class CheckedRandomAccessList<E> extends CheckedList<E>
implements RandomAccess
{
@java.io.Serial
private static final long serialVersionUID = 1638200125423088369L;
CheckedRandomAccessList(List<E> list, Class<E> type) {
@ -3580,6 +3616,7 @@ public class Collections {
private static class CheckedMap<K,V>
implements Map<K,V>, Serializable
{
@java.io.Serial
private static final long serialVersionUID = 5742860141034234728L;
private final Map<K, V> m;
@ -3979,6 +4016,7 @@ public class Collections {
static class CheckedSortedMap<K,V> extends CheckedMap<K,V>
implements SortedMap<K,V>, Serializable
{
@java.io.Serial
private static final long serialVersionUID = 1599671320688067438L;
private final SortedMap<K, V> sm;
@ -4053,6 +4091,7 @@ public class Collections {
static class CheckedNavigableMap<K,V> extends CheckedSortedMap<K,V>
implements NavigableMap<K,V>, Serializable
{
@java.io.Serial
private static final long serialVersionUID = -4852462692372534096L;
private final NavigableMap<K, V> nm;
@ -4331,6 +4370,7 @@ public class Collections {
extends AbstractSet<E>
implements Serializable
{
@java.io.Serial
private static final long serialVersionUID = 1582296315990362920L;
public Iterator<E> iterator() { return emptyIterator(); }
@ -4364,6 +4404,7 @@ public class Collections {
public Spliterator<E> spliterator() { return Spliterators.emptySpliterator(); }
// Preserves singleton property
@java.io.Serial
private Object readResolve() {
return EMPTY_SET;
}
@ -4455,6 +4496,7 @@ public class Collections {
private static class EmptyList<E>
extends AbstractList<E>
implements RandomAccess, Serializable {
@java.io.Serial
private static final long serialVersionUID = 8842843931221139166L;
public Iterator<E> iterator() {
@ -4512,6 +4554,7 @@ public class Collections {
public Spliterator<E> spliterator() { return Spliterators.emptySpliterator(); }
// Preserves singleton property
@java.io.Serial
private Object readResolve() {
return EMPTY_LIST;
}
@ -4598,6 +4641,7 @@ public class Collections {
extends AbstractMap<K,V>
implements Serializable
{
@java.io.Serial
private static final long serialVersionUID = 6428348081105594320L;
public int size() {return 0;}
@ -4678,6 +4722,7 @@ public class Collections {
}
// Preserves singleton property
@java.io.Serial
private Object readResolve() {
return EMPTY_MAP;
}
@ -4777,6 +4822,7 @@ public class Collections {
extends AbstractSet<E>
implements Serializable
{
@java.io.Serial
private static final long serialVersionUID = 3193687207550431679L;
private final E element;
@ -4830,6 +4876,7 @@ public class Collections {
extends AbstractList<E>
implements RandomAccess, Serializable {
@java.io.Serial
private static final long serialVersionUID = 3093736618740652951L;
private final E element;
@ -4898,6 +4945,7 @@ public class Collections {
private static class SingletonMap<K,V>
extends AbstractMap<K,V>
implements Serializable {
@java.io.Serial
private static final long serialVersionUID = -6979724477215052911L;
private final K k;
@ -5035,6 +5083,7 @@ public class Collections {
extends AbstractList<E>
implements RandomAccess, Serializable
{
@java.io.Serial
private static final long serialVersionUID = 2739099268398711800L;
final int n;
@ -5166,6 +5215,7 @@ public class Collections {
return stream().spliterator();
}
@java.io.Serial
private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
ois.defaultReadObject();
SharedSecrets.getJavaObjectInputStreamAccess().checkArray(ois, Object[].class, n);
@ -5203,6 +5253,7 @@ public class Collections {
private static class ReverseComparator
implements Comparator<Comparable<Object>>, Serializable {
@java.io.Serial
private static final long serialVersionUID = 7207038068494060240L;
static final ReverseComparator REVERSE_ORDER
@ -5212,6 +5263,7 @@ public class Collections {
return c2.compareTo(c1);
}
@java.io.Serial
private Object readResolve() { return Collections.reverseOrder(); }
@Override
@ -5258,6 +5310,7 @@ public class Collections {
private static class ReverseComparator2<T> implements Comparator<T>,
Serializable
{
@java.io.Serial
private static final long serialVersionUID = 4374092139857L;
/**
@ -5592,8 +5645,10 @@ public class Collections {
@Override
public Stream<E> parallelStream() {return s.parallelStream();}
@java.io.Serial
private static final long serialVersionUID = 2454657854757543876L;
@java.io.Serial
private void readObject(java.io.ObjectInputStream stream)
throws IOException, ClassNotFoundException
{
@ -5629,6 +5684,7 @@ public class Collections {
*/
static class AsLIFOQueue<E> extends AbstractQueue<E>
implements Queue<E>, Serializable {
@java.io.Serial
private static final long serialVersionUID = 1802017725587941708L;
private final Deque<E> q;
AsLIFOQueue(Deque<E> q) { this.q = q; }

3
src/java.base/share/classes/java/util/Comparators.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -62,6 +62,7 @@ class Comparators {
* Null-friendly comparators
*/
static final class NullComparator<T> implements Comparator<T>, Serializable {
@java.io.Serial
private static final long serialVersionUID = -7569533591570686392L;
private final boolean nullFirst;
// if null, non-null Ts are considered equal

3
src/java.base/share/classes/java/util/ConcurrentModificationException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -68,6 +68,7 @@ package java.util;
* @since 1.2
*/
public class ConcurrentModificationException extends RuntimeException {
@java.io.Serial
private static final long serialVersionUID = -3666751008965953603L;
/**

4
src/java.base/share/classes/java/util/Currency.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -113,6 +113,7 @@ import sun.util.logging.PlatformLogger;
*/
public final class Currency implements Serializable {
@java.io.Serial
private static final long serialVersionUID = -158308464356906721L;
/**
@ -661,6 +662,7 @@ public final class Currency implements Serializable {
/**
* Resolves instances being deserialized to a single instance per currency.
*/
@java.io.Serial
private Object readResolve() {
return getInstance(currencyCode);
}

5
src/java.base/share/classes/java/util/Date.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -154,6 +154,7 @@ public class Date
* interoperability with JDK1.1. The Date was modified to write
* and read only the UTC time.
*/
@java.io.Serial
private static final long serialVersionUID = 7523967970034938905L;
/**
@ -1318,6 +1319,7 @@ public class Date
* is emitted (long). This represents the offset from
* January 1, 1970, 00:00:00 GMT in milliseconds.
*/
@java.io.Serial
private void writeObject(ObjectOutputStream s)
throws IOException
{
@ -1328,6 +1330,7 @@ public class Date
/**
* Reconstitute this object from a stream (i.e., deserialize it).
*/
@java.io.Serial
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException
{

3
src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -37,6 +37,7 @@ package java.util;
*/
public class DuplicateFormatFlagsException extends IllegalFormatException {
@java.io.Serial
private static final long serialVersionUID = 18890531L;
private String flags;

3
src/java.base/share/classes/java/util/EmptyStackException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -35,6 +35,7 @@ package java.util;
*/
public
class EmptyStackException extends RuntimeException {
@java.io.Serial
private static final long serialVersionUID = 5084686378493302095L;
/**

5
src/java.base/share/classes/java/util/EnumMap.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -754,6 +754,7 @@ public class EnumMap<K extends Enum<K>, V> extends AbstractMap<K, V>
.getEnumConstantsShared(keyType);
}
@java.io.Serial
private static final long serialVersionUID = 458661240069192865L;
/**
@ -765,6 +766,7 @@ public class EnumMap<K extends Enum<K>, V> extends AbstractMap<K, V>
* and value (Object) for each key-value mapping represented
* by the enum map.
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException
{
@ -790,6 +792,7 @@ public class EnumMap<K extends Enum<K>, V> extends AbstractMap<K, V>
* deserialize it).
*/
@SuppressWarnings("unchecked")
@java.io.Serial
private void readObject(java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException
{

5
src/java.base/share/classes/java/util/EnumSet.java
View file

@ -80,6 +80,7 @@ public abstract class EnumSet<E extends Enum<E>> extends AbstractSet<E>
implements Cloneable, java.io.Serializable
{
// declare EnumSet.class serialization compatibility with JDK 8
@java.io.Serial
private static final long serialVersionUID = 1009687484059888093L;
/**
@ -449,6 +450,7 @@ public abstract class EnumSet<E extends Enum<E>> extends AbstractSet<E>
* held by this proxy
*/
@SuppressWarnings("unchecked")
@java.io.Serial
private Object readResolve() {
// instead of cast to E, we should perhaps use elementType.cast()
// to avoid injection of forged stream, but it will slow the
@ -459,6 +461,7 @@ public abstract class EnumSet<E extends Enum<E>> extends AbstractSet<E>
return result;
}
@java.io.Serial
private static final long serialVersionUID = 362491234563181265L;
}
@ -471,6 +474,7 @@ public abstract class EnumSet<E extends Enum<E>> extends AbstractSet<E>
* @return a {@link SerializationProxy}
* representing the state of this instance
*/
@java.io.Serial
Object writeReplace() {
return new SerializationProxy<>(this);
}
@ -479,6 +483,7 @@ public abstract class EnumSet<E extends Enum<E>> extends AbstractSet<E>
* @param s the stream
* @throws java.io.InvalidObjectException always
*/
@java.io.Serial
private void readObject(java.io.ObjectInputStream s)
throws java.io.InvalidObjectException {
throw new java.io.InvalidObjectException("Proxy required");

3
src/java.base/share/classes/java/util/EventObject.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,6 +38,7 @@ package java.util;
public class EventObject implements java.io.Serializable {
@java.io.Serial
private static final long serialVersionUID = 5516075349620653480L;
/**

3
src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -37,6 +37,7 @@ package java.util;
public class FormatFlagsConversionMismatchException
extends IllegalFormatException
{
@java.io.Serial
private static final long serialVersionUID = 19120414L;
private String f;

3
src/java.base/share/classes/java/util/FormatterClosedException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,7 @@ package java.util;
*/
public class FormatterClosedException extends IllegalStateException {
@java.io.Serial
private static final long serialVersionUID = 18111216L;
/**

2
src/java.base/share/classes/java/util/GregorianCalendar.java
View file

@ -497,6 +497,7 @@ public class GregorianCalendar extends Calendar {
// Proclaim serialization compatibility with JDK 1.1
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
@java.io.Serial
static final long serialVersionUID = -8125100834729963327L;
// Reference to the sun.util.calendar.Gregorian instance (singleton).
@ -3229,6 +3230,7 @@ public class GregorianCalendar extends Calendar {
/**
* Updates internal state.
*/
@java.io.Serial
private void readObject(ObjectInputStream stream)
throws IOException, ClassNotFoundException {
stream.defaultReadObject();

3
src/java.base/share/classes/java/util/HashMap.java
View file

@ -138,6 +138,7 @@ import jdk.internal.access.SharedSecrets;
public class HashMap<K,V> extends AbstractMap<K,V>
implements Map<K,V>, Cloneable, Serializable {
@java.io.Serial
private static final long serialVersionUID = 362498820763181265L;
/*
@ -1489,6 +1490,7 @@ public class HashMap<K,V> extends AbstractMap<K,V>
* for each key-value mapping. The key-value mappings are
* emitted in no particular order.
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream s)
throws IOException {
int buckets = capacity();
@ -1506,6 +1508,7 @@ public class HashMap<K,V> extends AbstractMap<K,V>
* could not be found
* @throws IOException if an I/O error occurs
*/
@java.io.Serial
private void readObject(java.io.ObjectInputStream s)
throws IOException, ClassNotFoundException {
// Read in the threshold (ignored), loadfactor, and any hidden stuff

3
src/java.base/share/classes/java/util/HashSet.java
View file

@ -91,6 +91,7 @@ public class HashSet<E>
extends AbstractSet<E>
implements Set<E>, Cloneable, java.io.Serializable
{
@java.io.Serial
static final long serialVersionUID = -5024744406713321676L;
private transient HashMap<E,Object> map;
@ -271,6 +272,7 @@ public class HashSet<E>
* (int), followed by all of its elements (each an Object) in
* no particular order.
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException {
// Write out any hidden serialization magic
@ -292,6 +294,7 @@ public class HashSet<E>
* Reconstitute the {@code HashSet} instance from a stream (that is,
* deserialize it).
*/
@java.io.Serial
private void readObject(java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException {
// Read in any hidden serialization magic

5
src/java.base/share/classes/java/util/Hashtable.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -171,6 +171,7 @@ public class Hashtable<K,V>
private transient int modCount = 0;
/** use serialVersionUID from JDK 1.0.2 for interoperability */
@java.io.Serial
private static final long serialVersionUID = 1421746759512286392L;
/**
@ -1201,6 +1202,7 @@ public class Hashtable<K,V>
* for each key-value mapping represented by the Hashtable
* The key-value mappings are emitted in no particular order.
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream s)
throws IOException {
writeHashtable(s);
@ -1254,6 +1256,7 @@ public class Hashtable<K,V>
/**
* Reconstitute the Hashtable from a stream (i.e., deserialize it).
*/
@java.io.Serial
private void readObject(java.io.ObjectInputStream s)
throws IOException, ClassNotFoundException {
readHashtable(s);

6
src/java.base/share/classes/java/util/IdentityHashMap.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -1259,7 +1259,7 @@ public class IdentityHashMap<K,V>
}
}
@java.io.Serial
private static final long serialVersionUID = 8188218128353913216L;
/**
@ -1272,6 +1272,7 @@ public class IdentityHashMap<K,V>
* IdentityHashMap. The key-value mappings are emitted in no
* particular order.
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException {
// Write out and any hidden stuff
@ -1295,6 +1296,7 @@ public class IdentityHashMap<K,V>
* Reconstitutes the {@code IdentityHashMap} instance from a stream (i.e.,
* deserializes it).
*/
@java.io.Serial
private void readObject(java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException {
// Read in any hidden stuff

3
src/java.base/share/classes/java/util/IllegalFormatCodePointException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,6 +38,7 @@ package java.util;
*/
public class IllegalFormatCodePointException extends IllegalFormatException {
@java.io.Serial
private static final long serialVersionUID = 19080630L;
private int c;

3
src/java.base/share/classes/java/util/IllegalFormatConversionException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -37,6 +37,7 @@ package java.util;
*/
public class IllegalFormatConversionException extends IllegalFormatException {
@java.io.Serial
private static final long serialVersionUID = 17000126L;
private char c;

3
src/java.base/share/classes/java/util/IllegalFormatException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -35,6 +35,7 @@ package java.util;
*/
public class IllegalFormatException extends IllegalArgumentException {
@java.io.Serial
private static final long serialVersionUID = 18830826L;
// package-private to prevent explicit instantiation

3
src/java.base/share/classes/java/util/IllegalFormatFlagsException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,7 @@ package java.util;
*/
public class IllegalFormatFlagsException extends IllegalFormatException {
@java.io.Serial
private static final long serialVersionUID = 790824L;
private String flags;

3
src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -34,6 +34,7 @@ package java.util;
*/
public class IllegalFormatPrecisionException extends IllegalFormatException {
@java.io.Serial
private static final long serialVersionUID = 18711008L;
private int p;

3
src/java.base/share/classes/java/util/IllegalFormatWidthException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -33,6 +33,7 @@ package java.util;
*/
public class IllegalFormatWidthException extends IllegalFormatException {
@java.io.Serial
private static final long serialVersionUID = 16660902L;
private int w;

3
src/java.base/share/classes/java/util/IllformedLocaleException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,6 +41,7 @@ package java.util;
*/
public class IllformedLocaleException extends RuntimeException {
@java.io.Serial
private static final long serialVersionUID = -5245986824925681401L;
private int _errIdx = -1;

16
src/java.base/share/classes/java/util/ImmutableCollections.java
View file

@ -418,10 +418,12 @@ class ImmutableCollections {
throw outOfBounds(index);
}
@java.io.Serial
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
throw new InvalidObjectException("not serial proxy");
}
@java.io.Serial
private Object writeReplace() {
if (e1 == null) {
return new CollSer(CollSer.IMM_LIST, e0);
@ -498,10 +500,12 @@ class ImmutableCollections {
return elements[index];
}
@java.io.Serial
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
throw new InvalidObjectException("not serial proxy");
}
@java.io.Serial
private Object writeReplace() {
return new CollSer(CollSer.IMM_LIST, elements);
}
@ -623,10 +627,12 @@ class ImmutableCollections {
};
}
@java.io.Serial
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
throw new InvalidObjectException("not serial proxy");
}
@java.io.Serial
private Object writeReplace() {
if (e1 == null) {
return new CollSer(CollSer.IMM_SET, e0);
@ -806,10 +812,12 @@ class ImmutableCollections {
}
}
@java.io.Serial
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
throw new InvalidObjectException("not serial proxy");
}
@java.io.Serial
private Object writeReplace() {
Object[] array = new Object[size];
int dest = 0;
@ -906,10 +914,12 @@ class ImmutableCollections {
return false;
}
@java.io.Serial
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
throw new InvalidObjectException("not serial proxy");
}
@java.io.Serial
private Object writeReplace() {
return new CollSer(CollSer.IMM_MAP, k0, v0);
}
@ -1110,10 +1120,12 @@ class ImmutableCollections {
}
}
@java.io.Serial
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
throw new InvalidObjectException("not serial proxy");
}
@java.io.Serial
private Object writeReplace() {
Object[] array = new Object[2 * size];
int len = table.length;
@ -1138,6 +1150,7 @@ class ImmutableCollections {
* @since 9
*/
final class CollSer implements Serializable {
@java.io.Serial
private static final long serialVersionUID = 6309168927139932177L;
static final int IMM_LIST = 1;
@ -1198,6 +1211,7 @@ final class CollSer implements Serializable {
* @throws InvalidObjectException if the count is negative
* @since 9
*/
@java.io.Serial
private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
ois.defaultReadObject();
int len = ois.readInt();
@ -1227,6 +1241,7 @@ final class CollSer implements Serializable {
* @throws IOException if an I/O error occurs
* @since 9
*/
@java.io.Serial
private void writeObject(ObjectOutputStream oos) throws IOException {
oos.defaultWriteObject();
oos.writeInt(array.length);
@ -1253,6 +1268,7 @@ final class CollSer implements Serializable {
* @throws ObjectStreamException if another serialization error has occurred
* @since 9
*/
@java.io.Serial
private Object readResolve() throws ObjectStreamException {
try {
if (array == null) {

3
src/java.base/share/classes/java/util/InputMismatchException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,7 @@ package java.util;
*/
public
class InputMismatchException extends NoSuchElementException {
@java.io.Serial
private static final long serialVersionUID = 8811230760997066428L;
/**

5
src/java.base/share/classes/java/util/InvalidPropertiesFormatException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -45,6 +45,7 @@ import java.io.IOException;
public class InvalidPropertiesFormatException extends IOException {
@java.io.Serial
private static final long serialVersionUID = 7763056076009360219L;
/**
@ -74,6 +75,7 @@ public class InvalidPropertiesFormatException extends IOException {
* Throws NotSerializableException, since InvalidPropertiesFormatException
* objects are not intended to be serializable.
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream out)
throws NotSerializableException
{
@ -84,6 +86,7 @@ public class InvalidPropertiesFormatException extends IOException {
* Throws NotSerializableException, since InvalidPropertiesFormatException
* objects are not intended to be serializable.
*/
@java.io.Serial
private void readObject(java.io.ObjectInputStream in)
throws NotSerializableException
{

2
src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
View file

@ -251,6 +251,7 @@ class JapaneseImperialCalendar extends Calendar {
// Proclaim serialization compatibility with JDK 1.6
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
@java.io.Serial
private static final long serialVersionUID = -3364572813905467929L;
static {
@ -2391,6 +2392,7 @@ class JapaneseImperialCalendar extends Calendar {
/**
* Updates internal state.
*/
@java.io.Serial
private void readObject(ObjectInputStream stream)
throws IOException, ClassNotFoundException {
stream.defaultReadObject();

3
src/java.base/share/classes/java/util/JumboEnumSet.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -34,6 +34,7 @@ package java.util;
* @serial exclude
*/
class JumboEnumSet<E extends Enum<E>> extends EnumSet<E> {
@java.io.Serial
private static final long serialVersionUID = 334349849919042784L;
/**

1
src/java.base/share/classes/java/util/LinkedHashMap.java
View file

@ -196,6 +196,7 @@ public class LinkedHashMap<K,V>
}
}
@java.io.Serial
private static final long serialVersionUID = 3801124242820219131L;
/**

3
src/java.base/share/classes/java/util/LinkedHashSet.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -119,6 +119,7 @@ public class LinkedHashSet<E>
extends HashSet<E>
implements Set<E>, Cloneable, java.io.Serializable {
@java.io.Serial
private static final long serialVersionUID = -2851667679971038690L;
/**

5
src/java.base/share/classes/java/util/LinkedList.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -1112,6 +1112,7 @@ public class LinkedList<E>
return a;
}
@java.io.Serial
private static final long serialVersionUID = 876323262645176354L;
/**
@ -1122,6 +1123,7 @@ public class LinkedList<E>
* contains) is emitted (int), followed by all of its
* elements (each an Object) in the proper order.
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException {
// Write out any hidden serialization magic
@ -1140,6 +1142,7 @@ public class LinkedList<E>
* (that is, deserializes it).
*/
@SuppressWarnings("unchecked")
@java.io.Serial
private void readObject(java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException {
// Read in any hidden serialization magic

5
src/java.base/share/classes/java/util/Locale.java
View file

@ -633,6 +633,7 @@ public final class Locale implements Cloneable, Serializable {
/** serialization ID
*/
@java.io.Serial
static final long serialVersionUID = 9149081749638150636L;
/**
@ -2301,6 +2302,7 @@ public final class Locale implements Cloneable, Serializable {
* (See <a href="java.base/java/util/Locale.html#getExtensionKeys()">getExtensionKeys()</a>,
* <a href="java.base/java/util/Locale.html#getExtension(char)">getExtension(char)</a>)
*/
@java.io.Serial
private static final ObjectStreamField[] serialPersistentFields = {
new ObjectStreamField("language", String.class),
new ObjectStreamField("country", String.class),
@ -2316,6 +2318,7 @@ public final class Locale implements Cloneable, Serializable {
* @throws IOException
* @since 1.7
*/
@java.io.Serial
private void writeObject(ObjectOutputStream out) throws IOException {
ObjectOutputStream.PutField fields = out.putFields();
fields.put("language", baseLocale.getLanguage());
@ -2335,6 +2338,7 @@ public final class Locale implements Cloneable, Serializable {
* @throws IllformedLocaleException
* @since 1.7
*/
@java.io.Serial
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
ObjectInputStream.GetField fields = in.readFields();
String language = (String)fields.get("language", "");
@ -2371,6 +2375,7 @@ public final class Locale implements Cloneable, Serializable {
* the deserialized <code>Locale</code>.
* @throws java.io.ObjectStreamException
*/
@java.io.Serial
private Object readResolve() throws java.io.ObjectStreamException {
return getInstance(baseLocale.getLanguage(), baseLocale.getScript(),
baseLocale.getRegion(), baseLocale.getVariant(), localeExtensions);

3
src/java.base/share/classes/java/util/MissingFormatArgumentException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,6 +38,7 @@ package java.util;
*/
public class MissingFormatArgumentException extends IllegalFormatException {
@java.io.Serial
private static final long serialVersionUID = 19190115L;
private String s;

3
src/java.base/share/classes/java/util/MissingFormatWidthException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,7 @@ package java.util;
*/
public class MissingFormatWidthException extends IllegalFormatException {
@java.io.Serial
private static final long serialVersionUID = 15560123L;
private String s;

3
src/java.base/share/classes/java/util/MissingResourceException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -108,6 +108,7 @@ class MissingResourceException extends RuntimeException {
//============ privates ============
// serialization compatibility with JDK1.1
@java.io.Serial
private static final long serialVersionUID = -4876345176062000401L;
/**

3
src/java.base/share/classes/java/util/NoSuchElementException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,7 @@ package java.util;
*/
public
class NoSuchElementException extends RuntimeException {
@java.io.Serial
private static final long serialVersionUID = 6769829250639411880L;
/**

3
src/java.base/share/classes/java/util/PriorityQueue.java
View file

@ -87,6 +87,7 @@ import jdk.internal.util.ArraysSupport;
public class PriorityQueue<E> extends AbstractQueue<E>
implements java.io.Serializable {
@java.io.Serial
private static final long serialVersionUID = -7720805057305804111L;
private static final int DEFAULT_INITIAL_CAPACITY = 11;
@ -755,6 +756,7 @@ public class PriorityQueue<E> extends AbstractQueue<E>
* emitted (int), followed by all of its elements
* (each an {@code Object}) in the proper order.
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException {
// Write out element count, and any hidden stuff
@ -778,6 +780,7 @@ public class PriorityQueue<E> extends AbstractQueue<E>
* could not be found
* @throws java.io.IOException if an I/O error occurs
*/
@java.io.Serial
private void readObject(java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException {
// Read in size, and any hidden stuff

1
src/java.base/share/classes/java/util/Properties.java
View file

@ -142,6 +142,7 @@ class Properties extends Hashtable<Object,Object> {
/**
* use serialVersionUID from JDK 1.1.X for interoperability
*/
@java.io.Serial
private static final long serialVersionUID = 4112578634029874840L;
private static final Unsafe UNSAFE = Unsafe.getUnsafe();

9
src/java.base/share/classes/java/util/PropertyPermission.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -385,7 +385,7 @@ public final class PropertyPermission extends BasicPermission {
return new PropertyPermissionCollection();
}
@java.io.Serial
private static final long serialVersionUID = 885438825399942851L;
/**
@ -393,6 +393,7 @@ public final class PropertyPermission extends BasicPermission {
* to a stream. The actions are serialized, and the superclass
* takes care of the name.
*/
@java.io.Serial
private synchronized void writeObject(java.io.ObjectOutputStream s)
throws IOException
{
@ -407,6 +408,7 @@ public final class PropertyPermission extends BasicPermission {
* readObject is called to restore the state of the PropertyPermission from
* a stream.
*/
@java.io.Serial
private synchronized void readObject(java.io.ObjectInputStream s)
throws IOException, ClassNotFoundException
{
@ -596,6 +598,7 @@ final class PropertyPermissionCollection extends PermissionCollection
return (Enumeration)perms.elements();
}
@java.io.Serial
private static final long serialVersionUID = 7015263904581634791L;
// Need to maintain serialization interoperability with earlier releases,
@ -625,6 +628,7 @@ final class PropertyPermissionCollection extends PermissionCollection
* serialization compatibility with earlier releases. all_allowed
* unchanged.
*/
@java.io.Serial
private void writeObject(ObjectOutputStream out) throws IOException {
// Don't call out.defaultWriteObject()
@ -644,6 +648,7 @@ final class PropertyPermissionCollection extends PermissionCollection
* Reads in a Hashtable of PropertyPermissions and saves them in the
* perms field. Reads in all_allowed.
*/
@java.io.Serial
private void readObject(ObjectInputStream in)
throws IOException, ClassNotFoundException
{

6
src/java.base/share/classes/java/util/Random.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -76,6 +76,7 @@ import jdk.internal.misc.Unsafe;
public
class Random implements java.io.Serializable {
/** use serialVersionUID from JDK 1.1 for interoperability */
@java.io.Serial
static final long serialVersionUID = 3905348978240129619L;
/**
@ -1168,6 +1169,7 @@ class Random implements java.io.Serializable {
* @serialField haveNextNextGaussian boolean
* nextNextGaussian is valid
*/
@java.io.Serial
private static final ObjectStreamField[] serialPersistentFields = {
new ObjectStreamField("seed", Long.TYPE),
new ObjectStreamField("nextNextGaussian", Double.TYPE),
@ -1178,6 +1180,7 @@ class Random implements java.io.Serializable {
* Reconstitute the {@code Random} instance from a stream (that is,
* deserialize it).
*/
@java.io.Serial
private void readObject(java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException {
@ -1197,6 +1200,7 @@ class Random implements java.io.Serializable {
/**
* Save the {@code Random} instance to a stream.
*/
@java.io.Serial
private synchronized void writeObject(ObjectOutputStream s)
throws IOException {

3
src/java.base/share/classes/java/util/RegularEnumSet.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -34,6 +34,7 @@ package java.util;
* @serial exclude
*/
class RegularEnumSet<E extends Enum<E>> extends EnumSet<E> {
@java.io.Serial
private static final long serialVersionUID = 3411599620347842686L;
/**
* Bit vector representation of this set. The 2^k bit indicates the

3
src/java.base/share/classes/java/util/ServiceConfigurationError.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,6 +39,7 @@ public class ServiceConfigurationError
extends Error
{
@java.io.Serial
private static final long serialVersionUID = 74132770414881L;
/**

3
src/java.base/share/classes/java/util/SimpleTimeZone.java
View file

@ -1242,6 +1242,7 @@ public class SimpleTimeZone extends TimeZone {
public static final int UTC_TIME = 2;
// Proclaim compatibility with 1.1
@java.io.Serial
static final long serialVersionUID = -403250971215465050L;
// the internal serial version which says which version was written
@ -1636,6 +1637,7 @@ public class SimpleTimeZone extends TimeZone {
* mode <code>DOW_IN_MONTH_MODE</code>, which is the only mode recognized by
* JDK 1.1.
*/
@java.io.Serial
private void writeObject(ObjectOutputStream stream)
throws IOException
{
@ -1666,6 +1668,7 @@ public class SimpleTimeZone extends TimeZone {
* We handle both JDK 1.1
* binary formats and full formats with a packed byte array.
*/
@java.io.Serial
private void readObject(ObjectInputStream stream)
throws IOException, ClassNotFoundException
{

3
src/java.base/share/classes/java/util/Stack.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -137,5 +137,6 @@ class Stack<E> extends Vector<E> {
}
/** use serialVersionUID from JDK 1.0.2 for interoperability */
@java.io.Serial
private static final long serialVersionUID = 1224463164541339165L;
}

1
src/java.base/share/classes/java/util/TimeZone.java
View file

@ -160,6 +160,7 @@ public abstract class TimeZone implements Serializable, Cloneable {
private static final int ONE_DAY = 24*ONE_HOUR;
// Proclaim serialization compatibility with JDK 1.1
@java.io.Serial
static final long serialVersionUID = 3581463369166924961L;
/**

3
src/java.base/share/classes/java/util/TooManyListenersException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -48,6 +48,7 @@ package java.util;
*/
public class TooManyListenersException extends Exception {
@java.io.Serial
private static final long serialVersionUID = 5074640544770687831L;
/**

8
src/java.base/share/classes/java/util/TreeMap.java
View file

@ -1338,6 +1338,7 @@ public class TreeMap<K,V>
*/
abstract static class NavigableSubMap<K,V> extends AbstractMap<K,V>
implements NavigableMap<K,V>, java.io.Serializable {
@java.io.Serial
private static final long serialVersionUID = -2102997345730753016L;
/**
* The backing map.
@ -1843,6 +1844,7 @@ public class TreeMap<K,V>
* @serial include
*/
static final class AscendingSubMap<K,V> extends NavigableSubMap<K,V> {
@java.io.Serial
private static final long serialVersionUID = 912986545866124060L;
AscendingSubMap(TreeMap<K,V> m,
@ -1926,6 +1928,7 @@ public class TreeMap<K,V>
* @serial include
*/
static final class DescendingSubMap<K,V> extends NavigableSubMap<K,V> {
@java.io.Serial
private static final long serialVersionUID = 912986545866120460L;
DescendingSubMap(TreeMap<K,V> m,
boolean fromStart, K lo, boolean loInclusive,
@ -2018,9 +2021,11 @@ public class TreeMap<K,V>
*/
private class SubMap extends AbstractMap<K,V>
implements SortedMap<K,V>, java.io.Serializable {
@java.io.Serial
private static final long serialVersionUID = -6520786458950516097L;
private boolean fromStart = false, toEnd = false;
private K fromKey, toKey;
@java.io.Serial
private Object readResolve() {
return new AscendingSubMap<>(TreeMap.this,
fromStart, fromKey, true,
@ -2405,6 +2410,7 @@ public class TreeMap<K,V>
setColor(x, BLACK);
}
@java.io.Serial
private static final long serialVersionUID = 919286545866124006L;
/**
@ -2419,6 +2425,7 @@ public class TreeMap<K,V>
* or by the keys' natural ordering if the TreeMap has no
* Comparator).
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException {
// Write out the Comparator and any hidden stuff
@ -2438,6 +2445,7 @@ public class TreeMap<K,V>
* Reconstitute the {@code TreeMap} instance from a stream (i.e.,
* deserialize it).
*/
@java.io.Serial
private void readObject(final java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException {
// Read in the Comparator and any hidden stuff

3
src/java.base/share/classes/java/util/TreeSet.java
View file

@ -492,6 +492,7 @@ public class TreeSet<E> extends AbstractSet<E>
* set's Comparator, or by the elements' natural ordering if
* the set has no Comparator).
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException {
// Write out any hidden stuff
@ -512,6 +513,7 @@ public class TreeSet<E> extends AbstractSet<E>
* Reconstitute the {@code TreeSet} instance from a stream (that is,
* deserialize it).
*/
@java.io.Serial
private void readObject(java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException {
// Read in any hidden stuff
@ -554,5 +556,6 @@ public class TreeSet<E> extends AbstractSet<E>
return TreeMap.keySpliteratorFor(m);
}
@java.io.Serial
private static final long serialVersionUID = -2479143000061671589L;
}

3
src/java.base/share/classes/java/util/UUID.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -75,6 +75,7 @@ public final class UUID implements java.io.Serializable, Comparable<UUID> {
/**
* Explicit serialVersionUID for interoperability.
*/
@java.io.Serial
private static final long serialVersionUID = -4856846361193249489L;
/*

3
src/java.base/share/classes/java/util/UnknownFormatConversionException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,7 @@ package java.util;
*/
public class UnknownFormatConversionException extends IllegalFormatException {
@java.io.Serial
private static final long serialVersionUID = 19060418L;
private String s;

3
src/java.base/share/classes/java/util/UnknownFormatFlagsException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,7 @@ package java.util;
*/
public class UnknownFormatFlagsException extends IllegalFormatException {
@java.io.Serial
private static final long serialVersionUID = 19370506L;
private String flags;

3
src/java.base/share/classes/java/util/Vector.java
View file

@ -124,6 +124,7 @@ public class Vector<E>
protected int capacityIncrement;
/** use serialVersionUID from JDK 1.0.2 for interoperability */
@java.io.Serial
private static final long serialVersionUID = -2767605614048989439L;
/**
@ -1149,6 +1150,7 @@ public class Vector<E>
* @throws ClassNotFoundException if the stream contains data
* of a non-existing class
*/
@java.io.Serial
private void readObject(ObjectInputStream in)
throws IOException, ClassNotFoundException {
ObjectInputStream.GetField gfields = in.readFields();
@ -1170,6 +1172,7 @@ public class Vector<E>
* @param s the stream
* @throws java.io.IOException if an I/O error occurs
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException {
final java.io.ObjectOutputStream.PutField fields = s.putFields();

3
src/java.base/share/classes/java/util/jar/JarException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -34,6 +34,7 @@ package java.util.jar;
*/
public
class JarException extends java.util.zip.ZipException {
@java.io.Serial
private static final long serialVersionUID = 7159778400963954473L;
/**

3
src/java.base/share/classes/java/util/jar/JarVerifier.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -584,6 +584,7 @@ class JarVerifier {
* signing data that can be compared by object reference identity.
*/
private static class VerifierCodeSource extends CodeSource {
@java.io.Serial
private static final long serialVersionUID = -9047366145967768825L;
URL vlocation;

2
src/java.base/share/classes/java/util/regex/Pattern.java
View file

@ -935,6 +935,7 @@ public final class Pattern
*/
/** use serialVersionUID from Merlin b59 for interoperability */
@java.io.Serial
private static final long serialVersionUID = 5073258162644648461L;
/**
@ -1376,6 +1377,7 @@ public final class Pattern
* Recompile the Pattern instance from a stream. The original pattern
* string is read in and the object tree is recompiled from it.
*/
@java.io.Serial
private void readObject(java.io.ObjectInputStream s)
throws java.io.IOException, ClassNotFoundException {

3
src/java.base/share/classes/java/util/regex/PatternSyntaxException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -37,6 +37,7 @@ package java.util.regex;
public class PatternSyntaxException
extends IllegalArgumentException
{
@java.io.Serial
private static final long serialVersionUID = -3864639126226059218L;
private final String desc;

3
src/java.base/share/classes/java/util/zip/DataFormatException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -33,6 +33,7 @@ package java.util.zip;
*/
public
class DataFormatException extends Exception {
@java.io.Serial
private static final long serialVersionUID = 2219632870893641452L;
/**

3
src/java.base/share/classes/java/util/zip/ZipError.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -32,6 +32,7 @@ package java.util.zip;
* @since 1.6
*/
public class ZipError extends InternalError {
@java.io.Serial
private static final long serialVersionUID = 853973422266861979L;
/**

3
src/java.base/share/classes/java/util/zip/ZipException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -37,6 +37,7 @@ import java.io.IOException;
public
class ZipException extends IOException {
@java.io.Serial
private static final long serialVersionUID = 8000196834066748623L;
/**