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

6
src/java.base/share/classes/java/net/InetAddress.java
View file

@ -299,6 +299,7 @@ class InetAddress implements java.io.Serializable {
private transient String canonicalHostName = null;
/** use serialVersionUID from JDK 1.0.2 for interoperability */
@java.io.Serial
private static final long serialVersionUID = 3286316764910316507L;
/*
@ -353,6 +354,7 @@ class InetAddress implements java.io.Serializable {
* @throws ObjectStreamException if a new object replacing this
* object could not be created
*/
@java.io.Serial
private Object readResolve() throws ObjectStreamException {
// will replace the deserialized 'this' object
return new Inet4Address(holder().getHostName(), holder().getAddress());
@ -1687,6 +1689,7 @@ class InetAddress implements java.io.Serializable {
return (InetAddressImpl) impl;
}
@java.io.Serial
private void readObjectNoData () {
if (getClass().getClassLoader() != null) {
throw new SecurityException ("invalid address type");
@ -1698,6 +1701,7 @@ class InetAddress implements java.io.Serializable {
private static final long FIELDS_OFFSET
= UNSAFE.objectFieldOffset(InetAddress.class, "holder");
@java.io.Serial
private void readObject (ObjectInputStream s) throws
IOException, ClassNotFoundException {
if (getClass().getClassLoader() != null) {
@ -1721,12 +1725,14 @@ class InetAddress implements java.io.Serializable {
* @serialField address int
* @serialField family int
*/
@java.io.Serial
private static final ObjectStreamField[] serialPersistentFields = {
new ObjectStreamField("hostName", String.class),
new ObjectStreamField("address", int.class),
new ObjectStreamField("family", int.class),
};
@java.io.Serial
private void writeObject (ObjectOutputStream s) throws
IOException {
if (getClass().getClassLoader() != null) {