archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +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

3
src/java.base/share/classes/java/lang/invoke/LambdaConversionException.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
@ -31,6 +31,7 @@ package java.lang.invoke;
* @since 1.8
*/
public class LambdaConversionException extends Exception {
@java.io.Serial
private static final long serialVersionUID = 292L + 8L;
/**

7
src/java.base/share/classes/java/lang/invoke/MethodType.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 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
@ -104,6 +104,7 @@ class MethodType
implements Constable,
TypeDescriptor.OfMethod<Class<?>, MethodType>,
java.io.Serializable {
@java.io.Serial
private static final long serialVersionUID = 292L; // {rtype, {ptype...}}
// The rtype and ptypes fields define the structural identity of the method type:
@ -1229,6 +1230,7 @@ class MethodType
/**
* There are no serializable fields for {@code MethodType}.
*/
@java.io.Serial
private static final java.io.ObjectStreamField[] serialPersistentFields = { };
/**
@ -1251,6 +1253,7 @@ s.writeObject(this.parameterArray());
* @param s the stream to write the object to
* @throws java.io.IOException if there is a problem writing the object
*/
@java.io.Serial
private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
s.defaultWriteObject(); // requires serialPersistentFields to be an empty array
s.writeObject(returnType());
@ -1270,6 +1273,7 @@ s.writeObject(this.parameterArray());
* @see #readResolve
* @see #writeObject
*/
@java.io.Serial
private void readObject(java.io.ObjectInputStream s) throws java.io.IOException, ClassNotFoundException {
// Assign temporary defaults in case this object escapes
MethodType_init(void.class, NO_PTYPES);
@ -1309,6 +1313,7 @@ s.writeObject(this.parameterArray());
* after serialization.
* @return the fully initialized {@code MethodType} object
*/
@java.io.Serial
private Object readResolve() {
// Do not use a trusted path for deserialization:
// return makeImpl(rtype, ptypes, true);

4
src/java.base/share/classes/java/lang/invoke/SerializedLambda.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
@ -65,6 +65,7 @@ import java.util.Objects;
* @since 1.8
*/
public final class SerializedLambda implements Serializable {
@java.io.Serial
private static final long serialVersionUID = 8025925345765570181L;
private final Class<?> capturingClass;
private final String functionalInterfaceClass;
@ -225,6 +226,7 @@ public final class SerializedLambda implements Serializable {
return capturedArgs[i];
}
@java.io.Serial
private Object readResolve() throws ObjectStreamException {
try {
Method deserialize = AccessController.doPrivileged(new PrivilegedExceptionAction<>() {

3
src/java.base/share/classes/java/lang/invoke/StringConcatException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 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.lang.invoke;
* @since 9
*/
public class StringConcatException extends Exception {
@java.io.Serial
private static final long serialVersionUID = 292L + 9L;
/**

3
src/java.base/share/classes/java/lang/invoke/WrongMethodTypeException.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 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.lang.invoke;
* @since 1.7
*/
public class WrongMethodTypeException extends RuntimeException {
@java.io.Serial
private static final long serialVersionUID = 292L;
/**