From e782170003863f7cbe6552f455896e0684b8bbca Mon Sep 17 00:00:00 2001
From: nizarbenalla <nizar.benalla@oracle.com>
Date: Thu, 29 Feb 2024 10:14:25 +0100
Subject: [PATCH 01/14] added missing @ since tags to multiple methods and
 constructors following bug report JDK-8326951

---
 src/java.base/share/classes/java/lang/invoke/MethodHandles.java | 1 +
 .../java/lang/reflect/MalformedParameterizedTypeException.java  | 1 +
 src/java.base/share/classes/java/nio/MappedByteBuffer.java      | 1 +
 src/java.base/share/classes/java/util/Properties.java           | 1 +
 .../share/classes/java/util/concurrent/ThreadLocalRandom.java   | 2 ++
 src/java.base/share/classes/java/util/zip/Deflater.java         | 1 +
 6 files changed, 7 insertions(+)

diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index 530df86bdd632..ea6ed7d33309e 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -7919,6 +7919,7 @@ private static void tryFinallyChecks(MethodHandle target, MethodHandle cleanup)
      *                                  handles is not {@code int}, or if the types of
      *                                  the fallback handle and all of target handles are
      *                                  not the same.
+     * @since 17
      */
     public static MethodHandle tableSwitch(MethodHandle fallback, MethodHandle... targets) {
         Objects.requireNonNull(fallback);
diff --git a/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java b/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
index 1eac76b3e445d..151faef352990 100644
--- a/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
+++ b/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
@@ -50,6 +50,7 @@ public MalformedParameterizedTypeException() {
      * Constructs a {@code MalformedParameterizedTypeException} with
      * the given detail message.
      * @param message the detail message; may be {@code null}
+     * @since 10
      */
     public MalformedParameterizedTypeException(String message) {
         super(message);
diff --git a/src/java.base/share/classes/java/nio/MappedByteBuffer.java b/src/java.base/share/classes/java/nio/MappedByteBuffer.java
index 9740046322db0..e5ad8fbcfb04e 100644
--- a/src/java.base/share/classes/java/nio/MappedByteBuffer.java
+++ b/src/java.base/share/classes/java/nio/MappedByteBuffer.java
@@ -410,6 +410,7 @@ public final MappedByteBuffer rewind() {
      * of this buffer that the returned buffer represents, namely
      * {@code [index,index+length)}, where {@code index} and {@code length} are
      * assumed to satisfy the preconditions.
+     * @since 13
      */
     @Override
     public abstract MappedByteBuffer slice(int index, int length);
diff --git a/src/java.base/share/classes/java/util/Properties.java b/src/java.base/share/classes/java/util/Properties.java
index 8d38b9df94621..d581a2becc7eb 100644
--- a/src/java.base/share/classes/java/util/Properties.java
+++ b/src/java.base/share/classes/java/util/Properties.java
@@ -185,6 +185,7 @@ public Properties() {
      *         accommodate this many elements
      * @throws IllegalArgumentException if the initial capacity is less than
      *         zero.
+     * @since 10
      */
     public Properties(int initialCapacity) {
         this(null, initialCapacity);
diff --git a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
index dd1ea70195b3b..a732fa3547c56 100644
--- a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
+++ b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
@@ -506,6 +506,7 @@ public float nextFloat() {
      * {@inheritDoc}
      * @throws IllegalArgumentException {@inheritDoc}
      * @implNote {@inheritDoc}
+     * @since 17
      */
     @Override
     public float nextFloat(float bound) {
@@ -516,6 +517,7 @@ public float nextFloat(float bound) {
      * {@inheritDoc}
      * @throws IllegalArgumentException {@inheritDoc}
      * @implNote {@inheritDoc}
+     * @since 17
      */
     @Override
     public float nextFloat(float origin, float bound) {
diff --git a/src/java.base/share/classes/java/util/zip/Deflater.java b/src/java.base/share/classes/java/util/zip/Deflater.java
index 6d00a45742bca..472189758c70c 100644
--- a/src/java.base/share/classes/java/util/zip/Deflater.java
+++ b/src/java.base/share/classes/java/util/zip/Deflater.java
@@ -336,6 +336,7 @@ public void setDictionary(byte[] dictionary) {
      * @param dictionary the dictionary data bytes
      * @see Inflater#inflate
      * @see Inflater#getAdler()
+     * @since 11
      */
     public void setDictionary(ByteBuffer dictionary) {
         synchronized (zsRef) {

From cfe4323f402335637f0e82f34836eb3be1c21503 Mon Sep 17 00:00:00 2001
From: nizarbenalla <nizar.benalla@oracle.com>
Date: Fri, 15 Mar 2024 11:22:37 +0000
Subject: [PATCH 02/14] fix PrintStream:write:(byte[]) since tag

---
 src/java.base/share/classes/java/io/PrintStream.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/java.base/share/classes/java/io/PrintStream.java b/src/java.base/share/classes/java/io/PrintStream.java
index 6807827b0222b..9c492db48c49a 100644
--- a/src/java.base/share/classes/java/io/PrintStream.java
+++ b/src/java.base/share/classes/java/io/PrintStream.java
@@ -679,8 +679,6 @@ private void implWrite(byte[] buf, int off, int len) throws IOException {
      *
      * @see #writeBytes(byte[])
      * @see #write(byte[],int,int)
-     *
-     * @since 14
      */
     @Override
     public void write(byte[] buf) throws IOException {

From 2c04a9d8e773616b7b6239335d4e5eb955944ad1 Mon Sep 17 00:00:00 2001
From: nizarbenalla <nizar.benalla@oracle.com>
Date: Fri, 15 Mar 2024 11:30:50 +0000
Subject: [PATCH 03/14] fix rest of private/public since tags

---
 .../share/classes/java/security/interfaces/DSAPublicKey.java    | 1 -
 .../share/classes/java/security/interfaces/ECPublicKey.java     | 1 -
 .../share/classes/java/security/interfaces/EdECPrivateKey.java  | 1 -
 .../share/classes/java/security/interfaces/EdECPublicKey.java   | 1 -
 .../share/classes/java/security/interfaces/RSAPrivateKey.java   | 2 +-
 .../share/classes/java/security/interfaces/RSAPublicKey.java    | 2 +-
 .../share/classes/java/security/interfaces/XECPrivateKey.java   | 1 -
 .../share/classes/java/security/interfaces/XECPublicKey.java    | 1 -
 .../share/classes/javax/crypto/interfaces/DHPrivateKey.java     | 1 -
 .../share/classes/javax/crypto/interfaces/DHPublicKey.java      | 1 -
 10 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java b/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java
index 9ddf6d8406fee..bda26e19843bd 100644
--- a/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java
@@ -70,7 +70,6 @@ public interface DSAPublicKey extends DSAKey, java.security.PublicKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default DSAParams getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java b/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java
index 5e8efb90db5c5..070c99d8f7c24 100644
--- a/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java
@@ -67,7 +67,6 @@ public interface ECPublicKey extends PublicKey, ECKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default ECParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/EdECPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/EdECPrivateKey.java
index b3522fec4fe51..ae5af40e45bdf 100644
--- a/src/java.base/share/classes/java/security/interfaces/EdECPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/EdECPrivateKey.java
@@ -61,7 +61,6 @@ public interface EdECPrivateKey extends EdECKey, PrivateKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default NamedParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/EdECPublicKey.java b/src/java.base/share/classes/java/security/interfaces/EdECPublicKey.java
index 664e76b6971fe..5c7f57c66a9eb 100644
--- a/src/java.base/share/classes/java/security/interfaces/EdECPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/EdECPublicKey.java
@@ -56,7 +56,6 @@ public interface EdECPublicKey extends EdECKey, PublicKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default NamedParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java
index 6e4ea536e32f9..82bdcba5bb03b 100644
--- a/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java
@@ -68,7 +68,7 @@ public interface RSAPrivateKey extends java.security.PrivateKey, RSAKey
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
+     * @since 11
      */
     @Override
     default AlgorithmParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java b/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java
index 2e1d89723e4f8..0ccd040b0103f 100644
--- a/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java
@@ -65,7 +65,7 @@ public interface RSAPublicKey extends java.security.PublicKey, RSAKey
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
+     * @since 11
      */
     @Override
     default AlgorithmParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/XECPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/XECPrivateKey.java
index b555f587fb67d..45604acf54c96 100644
--- a/src/java.base/share/classes/java/security/interfaces/XECPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/XECPrivateKey.java
@@ -62,7 +62,6 @@ public interface XECPrivateKey extends XECKey, PrivateKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default AlgorithmParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/XECPublicKey.java b/src/java.base/share/classes/java/security/interfaces/XECPublicKey.java
index 6b1806df0ebf8..6da276de66718 100644
--- a/src/java.base/share/classes/java/security/interfaces/XECPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/XECPublicKey.java
@@ -60,7 +60,6 @@ public interface XECPublicKey extends XECKey, PublicKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default AlgorithmParameterSpec getParams() {
diff --git a/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java b/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java
index fb7d2f83108b7..81b4a67b5ae41 100644
--- a/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java
+++ b/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java
@@ -65,7 +65,6 @@ public interface DHPrivateKey extends DHKey, java.security.PrivateKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default DHParameterSpec getParams() {
diff --git a/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java b/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java
index 8785b8dfec84c..5650bf2219307 100644
--- a/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java
+++ b/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java
@@ -65,7 +65,6 @@ public interface DHPublicKey extends DHKey, java.security.PublicKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default DHParameterSpec getParams() {

From 5da3f0d83d19393eeb3a9da68aac40dd999de660 Mon Sep 17 00:00:00 2001
From: nizarbenalla <nizar.benalla@oracle.com>
Date: Sun, 17 Mar 2024 18:30:05 +0000
Subject: [PATCH 04/14] removed unnecessary @ since tags

---
 .../share/classes/java/security/interfaces/DSAPrivateKey.java    | 1 -
 .../share/classes/java/security/interfaces/ECPrivateKey.java     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java
index ea842b6e12e27..d7bd5bc4fe12e 100644
--- a/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java
@@ -70,7 +70,6 @@ public interface DSAPrivateKey extends DSAKey, java.security.PrivateKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default DSAParams getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java
index 1694f46d4ab7c..2f99783e72cef 100644
--- a/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java
@@ -65,7 +65,6 @@ public interface ECPrivateKey extends PrivateKey, ECKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 22
      */
     @Override
     default ECParameterSpec getParams() {

From c21d3319b9b9eb13f5cc199cca3c91b32e4c1341 Mon Sep 17 00:00:00 2001
From: nizarbenalla <nizar.benalla@oracle.com>
Date: Mon, 18 Mar 2024 12:31:42 +0000
Subject: [PATCH 05/14] Revert "removed unnecessary @ since tags"

This reverts commit 5da3f0d83d19393eeb3a9da68aac40dd999de660.
---
 .../share/classes/java/security/interfaces/DSAPrivateKey.java    | 1 +
 .../share/classes/java/security/interfaces/ECPrivateKey.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java
index d7bd5bc4fe12e..ea842b6e12e27 100644
--- a/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/DSAPrivateKey.java
@@ -70,6 +70,7 @@ public interface DSAPrivateKey extends DSAKey, java.security.PrivateKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
+     * @since 22
      */
     @Override
     default DSAParams getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java
index 2f99783e72cef..1694f46d4ab7c 100644
--- a/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/ECPrivateKey.java
@@ -65,6 +65,7 @@ public interface ECPrivateKey extends PrivateKey, ECKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
+     * @since 22
      */
     @Override
     default ECParameterSpec getParams() {

From ba97724db02a892a343f7453ac1517e317f9a39d Mon Sep 17 00:00:00 2001
From: nizarbenalla <nizar.benalla@oracle.com>
Date: Mon, 18 Mar 2024 12:32:04 +0000
Subject: [PATCH 06/14] Revert "fix rest of private/public since tags"

This reverts commit 2c04a9d8e773616b7b6239335d4e5eb955944ad1.
---
 .../share/classes/java/security/interfaces/DSAPublicKey.java    | 1 +
 .../share/classes/java/security/interfaces/ECPublicKey.java     | 1 +
 .../share/classes/java/security/interfaces/EdECPrivateKey.java  | 1 +
 .../share/classes/java/security/interfaces/EdECPublicKey.java   | 1 +
 .../share/classes/java/security/interfaces/RSAPrivateKey.java   | 2 +-
 .../share/classes/java/security/interfaces/RSAPublicKey.java    | 2 +-
 .../share/classes/java/security/interfaces/XECPrivateKey.java   | 1 +
 .../share/classes/java/security/interfaces/XECPublicKey.java    | 1 +
 .../share/classes/javax/crypto/interfaces/DHPrivateKey.java     | 1 +
 .../share/classes/javax/crypto/interfaces/DHPublicKey.java      | 1 +
 10 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java b/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java
index bda26e19843bd..9ddf6d8406fee 100644
--- a/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/DSAPublicKey.java
@@ -70,6 +70,7 @@ public interface DSAPublicKey extends DSAKey, java.security.PublicKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
+     * @since 22
      */
     @Override
     default DSAParams getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java b/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java
index 070c99d8f7c24..5e8efb90db5c5 100644
--- a/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/ECPublicKey.java
@@ -67,6 +67,7 @@ public interface ECPublicKey extends PublicKey, ECKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
+     * @since 22
      */
     @Override
     default ECParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/EdECPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/EdECPrivateKey.java
index ae5af40e45bdf..b3522fec4fe51 100644
--- a/src/java.base/share/classes/java/security/interfaces/EdECPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/EdECPrivateKey.java
@@ -61,6 +61,7 @@ public interface EdECPrivateKey extends EdECKey, PrivateKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
+     * @since 22
      */
     @Override
     default NamedParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/EdECPublicKey.java b/src/java.base/share/classes/java/security/interfaces/EdECPublicKey.java
index 5c7f57c66a9eb..664e76b6971fe 100644
--- a/src/java.base/share/classes/java/security/interfaces/EdECPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/EdECPublicKey.java
@@ -56,6 +56,7 @@ public interface EdECPublicKey extends EdECKey, PublicKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
+     * @since 22
      */
     @Override
     default NamedParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java
index 82bdcba5bb03b..6e4ea536e32f9 100644
--- a/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/RSAPrivateKey.java
@@ -68,7 +68,7 @@ public interface RSAPrivateKey extends java.security.PrivateKey, RSAKey
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 11
+     * @since 22
      */
     @Override
     default AlgorithmParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java b/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java
index 0ccd040b0103f..2e1d89723e4f8 100644
--- a/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/RSAPublicKey.java
@@ -65,7 +65,7 @@ public interface RSAPublicKey extends java.security.PublicKey, RSAKey
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
-     * @since 11
+     * @since 22
      */
     @Override
     default AlgorithmParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/XECPrivateKey.java b/src/java.base/share/classes/java/security/interfaces/XECPrivateKey.java
index 45604acf54c96..b555f587fb67d 100644
--- a/src/java.base/share/classes/java/security/interfaces/XECPrivateKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/XECPrivateKey.java
@@ -62,6 +62,7 @@ public interface XECPrivateKey extends XECKey, PrivateKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
+     * @since 22
      */
     @Override
     default AlgorithmParameterSpec getParams() {
diff --git a/src/java.base/share/classes/java/security/interfaces/XECPublicKey.java b/src/java.base/share/classes/java/security/interfaces/XECPublicKey.java
index 6da276de66718..6b1806df0ebf8 100644
--- a/src/java.base/share/classes/java/security/interfaces/XECPublicKey.java
+++ b/src/java.base/share/classes/java/security/interfaces/XECPublicKey.java
@@ -60,6 +60,7 @@ public interface XECPublicKey extends XECKey, PublicKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
+     * @since 22
      */
     @Override
     default AlgorithmParameterSpec getParams() {
diff --git a/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java b/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java
index 81b4a67b5ae41..fb7d2f83108b7 100644
--- a/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java
+++ b/src/java.base/share/classes/javax/crypto/interfaces/DHPrivateKey.java
@@ -65,6 +65,7 @@ public interface DHPrivateKey extends DHKey, java.security.PrivateKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
+     * @since 22
      */
     @Override
     default DHParameterSpec getParams() {
diff --git a/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java b/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java
index 5650bf2219307..8785b8dfec84c 100644
--- a/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java
+++ b/src/java.base/share/classes/javax/crypto/interfaces/DHPublicKey.java
@@ -65,6 +65,7 @@ public interface DHPublicKey extends DHKey, java.security.PublicKey {
      * The default implementation returns {@code null}.
      *
      * @return {@inheritDoc java.security.AsymmetricKey}
+     * @since 22
      */
     @Override
     default DHParameterSpec getParams() {

From 3cec63e9a8e6b5ae70515bad2376f157f860cc8a Mon Sep 17 00:00:00 2001
From: nizarbenalla <nizar.benalla@oracle.com>
Date: Tue, 19 Mar 2024 15:51:37 +0000
Subject: [PATCH 07/14] added since tag

---
 .../util/concurrent/locks/AbstractQueuedLongSynchronizer.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
index f4d7d0c08c0c9..f25f6c491f13d 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
@@ -68,6 +68,7 @@ public abstract class AbstractQueuedLongSynchronizer
 
     /**
      * Constructor for subclasses to call.
+     * @since 14
      */
     public AbstractQueuedLongSynchronizer() {}
 

From 9ddd230dcf88bedade76a8e2804db6e120a200f8 Mon Sep 17 00:00:00 2001
From: nizarbenalla <nizar.benalla@oracle.com>
Date: Wed, 20 Mar 2024 02:11:45 +0000
Subject: [PATCH 08/14] update the copyright year to 2024

---
 src/java.base/share/classes/java/io/PrintStream.java            | 2 +-
 src/java.base/share/classes/java/lang/invoke/MethodHandles.java | 2 +-
 .../java/lang/reflect/MalformedParameterizedTypeException.java  | 2 +-
 test/jdk/jdk/security/jarsigner/Properties.java                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/java/io/PrintStream.java b/src/java.base/share/classes/java/io/PrintStream.java
index 9c492db48c49a..25c6a54f6dd4c 100644
--- a/src/java.base/share/classes/java/io/PrintStream.java
+++ b/src/java.base/share/classes/java/io/PrintStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, 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
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index ea6ed7d33309e..23dc9725307be 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, 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
diff --git a/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java b/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
index 151faef352990..e73b543d2e487 100644
--- a/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
+++ b/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
diff --git a/test/jdk/jdk/security/jarsigner/Properties.java b/test/jdk/jdk/security/jarsigner/Properties.java
index 9de99759798cb..28076a42405f3 100644
--- a/test/jdk/jdk/security/jarsigner/Properties.java
+++ b/test/jdk/jdk/security/jarsigner/Properties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, 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

From 4eaf0328b0d726998604d94ff7d6b934da8ef8b7 Mon Sep 17 00:00:00 2001
From: nizarbenalla <nizar.benalla@oracle.com>
Date: Wed, 20 Mar 2024 02:12:50 +0000
Subject: [PATCH 09/14] Revert "update the copyright year to 2024"

This reverts commit 9ddd230dcf88bedade76a8e2804db6e120a200f8.
---
 src/java.base/share/classes/java/io/PrintStream.java            | 2 +-
 src/java.base/share/classes/java/lang/invoke/MethodHandles.java | 2 +-
 .../java/lang/reflect/MalformedParameterizedTypeException.java  | 2 +-
 test/jdk/jdk/security/jarsigner/Properties.java                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/java/io/PrintStream.java b/src/java.base/share/classes/java/io/PrintStream.java
index 25c6a54f6dd4c..9c492db48c49a 100644
--- a/src/java.base/share/classes/java/io/PrintStream.java
+++ b/src/java.base/share/classes/java/io/PrintStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2023, 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
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index 23dc9725307be..ea6ed7d33309e 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, 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
diff --git a/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java b/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
index e73b543d2e487..151faef352990 100644
--- a/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
+++ b/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
diff --git a/test/jdk/jdk/security/jarsigner/Properties.java b/test/jdk/jdk/security/jarsigner/Properties.java
index 28076a42405f3..9de99759798cb 100644
--- a/test/jdk/jdk/security/jarsigner/Properties.java
+++ b/test/jdk/jdk/security/jarsigner/Properties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 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

From 7d6e969eb48a96c89804581da51158c2622b6e15 Mon Sep 17 00:00:00 2001
From: nizarbenalla <nizar.benalla@oracle.com>
Date: Wed, 20 Mar 2024 02:14:16 +0000
Subject: [PATCH 10/14] update the copyright year to 2024

---
 src/java.base/share/classes/java/io/PrintStream.java            | 2 +-
 src/java.base/share/classes/java/lang/invoke/MethodHandles.java | 2 +-
 .../java/lang/reflect/MalformedParameterizedTypeException.java  | 2 +-
 src/java.base/share/classes/java/util/Properties.java           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java.base/share/classes/java/io/PrintStream.java b/src/java.base/share/classes/java/io/PrintStream.java
index 9c492db48c49a..25c6a54f6dd4c 100644
--- a/src/java.base/share/classes/java/io/PrintStream.java
+++ b/src/java.base/share/classes/java/io/PrintStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, 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
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index ea6ed7d33309e..23dc9725307be 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, 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
diff --git a/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java b/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
index 151faef352990..e73b543d2e487 100644
--- a/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
+++ b/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
diff --git a/src/java.base/share/classes/java/util/Properties.java b/src/java.base/share/classes/java/util/Properties.java
index d581a2becc7eb..45ca0363660e5 100644
--- a/src/java.base/share/classes/java/util/Properties.java
+++ b/src/java.base/share/classes/java/util/Properties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, 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

From 97f4c946dc950f8ef913e2e3f7742fd09e168757 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Thu, 11 Apr 2024 00:10:02 +0000
Subject: [PATCH 11/14] Update full name


From 390a21f9b439deb62e64ada970b873ca72880f11 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Tue, 16 Apr 2024 16:54:49 +0100
Subject: [PATCH 12/14] removed change

---
 .../util/concurrent/locks/AbstractQueuedLongSynchronizer.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
index f25f6c491f13d..f4d7d0c08c0c9 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
@@ -68,7 +68,6 @@ public abstract class AbstractQueuedLongSynchronizer
 
     /**
      * Constructor for subclasses to call.
-     * @since 14
      */
     public AbstractQueuedLongSynchronizer() {}
 

From 670acaec2e0b4812c3c558cf5293d534ab4f3968 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Thu, 25 Apr 2024 14:02:48 +0100
Subject: [PATCH 13/14] deal with methods with different return types - added
 some spaces for readability

---
 .../share/classes/java/lang/invoke/MethodHandles.java    | 1 +
 .../reflect/MalformedParameterizedTypeException.java     | 1 +
 .../share/classes/java/nio/MappedByteBuffer.java         | 9 ++++++++-
 .../classes/java/util/concurrent/ThreadLocalRandom.java  | 2 ++
 src/java.base/share/classes/java/util/zip/Deflater.java  | 1 +
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index 23dc9725307be..823fd841c0541 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -7919,6 +7919,7 @@ private static void tryFinallyChecks(MethodHandle target, MethodHandle cleanup)
      *                                  handles is not {@code int}, or if the types of
      *                                  the fallback handle and all of target handles are
      *                                  not the same.
+     *
      * @since 17
      */
     public static MethodHandle tableSwitch(MethodHandle fallback, MethodHandle... targets) {
diff --git a/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java b/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
index e73b543d2e487..1762d42140ec6 100644
--- a/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
+++ b/src/java.base/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
@@ -50,6 +50,7 @@ public MalformedParameterizedTypeException() {
      * Constructs a {@code MalformedParameterizedTypeException} with
      * the given detail message.
      * @param message the detail message; may be {@code null}
+     *
      * @since 10
      */
     public MalformedParameterizedTypeException(String message) {
diff --git a/src/java.base/share/classes/java/nio/MappedByteBuffer.java b/src/java.base/share/classes/java/nio/MappedByteBuffer.java
index e5ad8fbcfb04e..d560d3843d23b 100644
--- a/src/java.base/share/classes/java/nio/MappedByteBuffer.java
+++ b/src/java.base/share/classes/java/nio/MappedByteBuffer.java
@@ -397,6 +397,8 @@ public final MappedByteBuffer rewind() {
      * {@code force()} on the returned buffer, will only act on the sub-range
      * of this buffer that the returned buffer represents, namely
      * {@code [position(),limit())}.
+     *
+     * @since 17
      */
     @Override
     public abstract MappedByteBuffer slice();
@@ -410,13 +412,16 @@ public final MappedByteBuffer rewind() {
      * of this buffer that the returned buffer represents, namely
      * {@code [index,index+length)}, where {@code index} and {@code length} are
      * assumed to satisfy the preconditions.
-     * @since 13
+     *
+     * @since 17
      */
     @Override
     public abstract MappedByteBuffer slice(int index, int length);
 
     /**
      * {@inheritDoc}
+     *
+     * @since 17
      */
     @Override
     public abstract MappedByteBuffer duplicate();
@@ -424,6 +429,8 @@ public final MappedByteBuffer rewind() {
     /**
      * {@inheritDoc}
      * @throws  ReadOnlyBufferException {@inheritDoc}
+     *
+     * @since 17
      */
     @Override
     public abstract MappedByteBuffer compact();
diff --git a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
index a732fa3547c56..5e3f73302d842 100644
--- a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
+++ b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
@@ -506,6 +506,7 @@ public float nextFloat() {
      * {@inheritDoc}
      * @throws IllegalArgumentException {@inheritDoc}
      * @implNote {@inheritDoc}
+     *
      * @since 17
      */
     @Override
@@ -517,6 +518,7 @@ public float nextFloat(float bound) {
      * {@inheritDoc}
      * @throws IllegalArgumentException {@inheritDoc}
      * @implNote {@inheritDoc}
+     *
      * @since 17
      */
     @Override
diff --git a/src/java.base/share/classes/java/util/zip/Deflater.java b/src/java.base/share/classes/java/util/zip/Deflater.java
index 472189758c70c..095583a778b0a 100644
--- a/src/java.base/share/classes/java/util/zip/Deflater.java
+++ b/src/java.base/share/classes/java/util/zip/Deflater.java
@@ -336,6 +336,7 @@ public void setDictionary(byte[] dictionary) {
      * @param dictionary the dictionary data bytes
      * @see Inflater#inflate
      * @see Inflater#getAdler()
+     *
      * @since 11
      */
     public void setDictionary(ByteBuffer dictionary) {

From e66fbf5a79ddc558aea02dede7527c2d914200bf Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nizar.benalla@oracle.com>
Date: Mon, 13 May 2024 21:26:06 +0100
Subject: [PATCH 14/14] empty commit and merge