Skip to content

Commit

Permalink
8281082: Improve javadoc references to JOSS
Browse files Browse the repository at this point in the history
Reviewed-by: iris, rriggs, naoto, lancea
  • Loading branch information
jddarcy committed Feb 1, 2022
1 parent c74b8f4 commit 9ca7ff3
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 13 deletions.
7 changes: 4 additions & 3 deletions src/java.base/share/classes/java/io/ObjectOutputStream.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2022, 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
Expand Down Expand Up @@ -656,10 +656,11 @@ protected void writeStreamHeader() throws IOException {
* stream. Subclasses of ObjectOutputStream may override this method to
* customize the way in which class descriptors are written to the
* serialization stream. The corresponding method in ObjectInputStream,
* {@code readClassDescriptor}, should then be overridden to
* {@link ObjectInputStream#readClassDescriptor readClassDescriptor}, should then be overridden to
* reconstitute the class descriptor from its custom stream representation.
* By default, this method writes class descriptors according to the format
* defined in the Object Serialization specification.
* defined in the <a href="{@docRoot}/../specs/serialization/index.html">
* <cite>Java Object Serialization Specification</cite></a>.
*
* <p>Note that this method will only be called if the ObjectOutputStream
* is not using the old serialization stream format (set by calling
Expand Down
5 changes: 3 additions & 2 deletions src/java.base/share/classes/java/io/Serial.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2022, 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
Expand Down Expand Up @@ -30,7 +30,8 @@
/**
* Indicates that an annotated field or method is part of the {@linkplain
* Serializable serialization mechanism} defined by the
* <cite>Java Object Serialization Specification</cite>. This
* <a href="{@docRoot}/../specs/serialization/output.html">
* <cite>Java Object Serialization Specification</cite></a>. This
* annotation type is intended to allow compile-time checking of
* serialization-related declarations, analogous to the checking
* enabled by the {@link java.lang.Override} annotation type to
Expand Down
7 changes: 4 additions & 3 deletions src/java.base/share/classes/java/lang/Enum.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2022, 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
Expand Down Expand Up @@ -51,8 +51,9 @@
* by the serialization mechanism. The serialized representation used
* for enum constants cannot be customized. Declarations of methods
* and fields that would otherwise interact with serialization are
* ignored, including {@code serialVersionUID}; see the <cite>Java
* Object Serialization Specification</cite> for details.
* ignored, including {@code serialVersionUID}; see the
* <a href="{@docRoot}/../specs/serialization/index.html"><cite>Java
* Object Serialization Specification</cite></a> for details.
*
* <p> Note that when using an enumeration type as the type of a set
* or as the type of the keys in a map, specialized and efficient
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/lang/String.java
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public final class String
*
* A String instance is written into an ObjectOutputStream according to
* <a href="{@docRoot}/../specs/serialization/protocol.html#stream-elements">
* Object Serialization Specification, Section 6.2, "Stream Elements"</a>
* <cite>Java Object Serialization Specification</cite>, Section 6.2, "Stream Elements"</a>
*/
@java.io.Serial
private static final ObjectStreamField[] serialPersistentFields =
Expand Down
4 changes: 2 additions & 2 deletions src/java.base/share/classes/java/security/Key.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2022, 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
Expand Down Expand Up @@ -84,7 +84,7 @@
* which should not be exposed in untrusted environments. See the
* <a href="{@docRoot}/../specs/serialization/security.html">
* Security Appendix</a>
* of the Serialization Specification for more information.
* of the <cite>Java Object Serialization Specification</cite> for more information.
*
* @see PublicKey
* @see PrivateKey
Expand Down
4 changes: 2 additions & 2 deletions src/java.base/share/classes/java/security/KeyRep.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2022, 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
Expand Down Expand Up @@ -44,7 +44,7 @@
* which should not be exposed in untrusted environments. See the
* <a href="{@docRoot}/../specs/serialization/security.html">
* Security Appendix</a>
* of the Serialization Specification for more information.
* of the <cite>Java Object Serialization Specification</cite> for more information.
*
* @see Key
* @see KeyFactory
Expand Down

1 comment on commit 9ca7ff3

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.