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

8229999: Apply java.io.Serial annotations to security types in java.base

Browse source 
Reviewed-by: rriggs, mullan
This commit is contained in:
Joe Darcy 2019-08-29 10:52:21 -07:00
parent 470d32df73
commit 6d4ef5aaf3
158 changed files with 377 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/java.base/share/classes/java/security/Permissions.java
View file

@ -328,6 +328,7 @@ implements Serializable
return pc;
}
@java.io.Serial
private static final long serialVersionUID = 4858622370623524688L;
// Need to maintain serialization interoperability with earlier releases,
@ -339,6 +340,7 @@ implements Serializable
* A table of the Permission classes and PermissionCollections.
* @serialField allPermission java.security.PermissionCollection
*/
@java.io.Serial
private static final ObjectStreamField[] serialPersistentFields = {
new ObjectStreamField("perms", Hashtable.class),
new ObjectStreamField("allPermission", PermissionCollection.class),
@ -352,6 +354,7 @@ implements Serializable
* serialization compatibility with earlier releases. allPermission
* unchanged.
*/
@java.io.Serial
private void writeObject(ObjectOutputStream out) throws IOException {
// Don't call out.defaultWriteObject()
@ -372,6 +375,7 @@ implements Serializable
* Reads in a Hashtable of Class/PermissionCollections and saves them in the
* permsMap field. Reads in allPermission.
*/
@java.io.Serial
private void readObject(ObjectInputStream in) throws IOException,
ClassNotFoundException {
// Don't call defaultReadObject()
@ -547,6 +551,7 @@ implements Serializable
return permsMap.elements();
}
@java.io.Serial
private static final long serialVersionUID = -8491988220802933440L;
// Need to maintain serialization interoperability with earlier releases,
// which had the serializable field:
@ -555,6 +560,7 @@ implements Serializable
* @serialField perms java.util.Hashtable
* A table of the Permissions (both key and value are same).
*/
@java.io.Serial
private static final ObjectStreamField[] serialPersistentFields = {
new ObjectStreamField("perms", Hashtable.class),
};
@ -566,6 +572,7 @@ implements Serializable
* Writes the contents of the permsMap field out as a Hashtable for
* serialization compatibility with earlier releases.
*/
@java.io.Serial
private void writeObject(ObjectOutputStream out) throws IOException {
// Don't call out.defaultWriteObject()
@ -584,6 +591,7 @@ implements Serializable
* Reads in a Hashtable of Permission/Permission and saves them in the
* permsMap field.
*/
@java.io.Serial
private void readObject(ObjectInputStream in) throws IOException,
ClassNotFoundException {
// Don't call defaultReadObject()