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

8231202: Suppress warnings on non-serializable non-transient instance fields in serializable classes

Browse source 
Reviewed-by: rriggs, chegar
This commit is contained in:
Joe Darcy 2019-10-09 10:17:50 -07:00
parent fbb4093562
commit 3c9b6d8554
18 changed files with 86 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -118,6 +118,7 @@ public class TreeMap<K,V>
*
* @serial
*/
@SuppressWarnings("serial") // Conditionally serializable
private final Comparator<? super K> comparator;
private transient Entry<K,V> root;
@ -1353,7 +1354,10 @@ public class TreeMap<K,V>
* if loInclusive is true, lo is the inclusive bound, else lo
* is the exclusive bound. Similarly for the upper bound.
*/
final K lo, hi;
@SuppressWarnings("serial") // Conditionally serializable
final K lo;
@SuppressWarnings("serial") // Conditionally serializable
final K hi;
final boolean fromStart, toEnd;
final boolean loInclusive, hiInclusive;
@ -1936,6 +1940,7 @@ public class TreeMap<K,V>
super(m, fromStart, lo, loInclusive, toEnd, hi, hiInclusive);
}
@SuppressWarnings("serial") // Conditionally serializable
private final Comparator<? super K> reverseComparator =
Collections.reverseOrder(m.comparator);
@ -2024,7 +2029,10 @@ public class TreeMap<K,V>
@java.io.Serial
private static final long serialVersionUID = -6520786458950516097L;
private boolean fromStart = false, toEnd = false;
private K fromKey, toKey;
@SuppressWarnings("serial") // Conditionally serializable
private K fromKey;
@SuppressWarnings("serial") // Conditionally serializable
private K toKey;
@java.io.Serial
private Object readResolve() {
return new AscendingSubMap<>(TreeMap.this,