From 97c921284222ca53a293dcebe513fbb59ee9c690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= Date: Mon, 21 Oct 2024 17:14:25 +0000 Subject: [PATCH] 8342698: Fix order of @param tags in module java.base Reviewed-by: iris --- .../share/classes/java/lang/invoke/MethodHandles.java | 2 +- .../share/classes/java/lang/invoke/VarHandle.java | 6 +++--- .../security/cert/CertificateRevokedException.java | 6 +++--- .../java/security/interfaces/DSAKeyPairGenerator.java | 8 ++++---- src/java.base/share/classes/java/util/Arrays.java | 4 ++-- .../share/classes/java/util/stream/Collectors.java | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) 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 9e292373f9c..b45ff858cd3 100644 --- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java +++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java @@ -463,8 +463,8 @@ public class MethodHandles { * If there is a security manager, its {@code checkPermission} method * is called with a {@code ReflectPermission("suppressAccessChecks")} permission. * @param the desired type of the result, either {@link Member} or a subtype - * @param target a direct method handle to crack into symbolic reference components * @param expected a class object representing the desired result type {@code T} + * @param target a direct method handle to crack into symbolic reference components * @return a reference to the method, constructor, or field object * @throws SecurityException if the caller is not privileged to call {@code setAccessible} * @throws NullPointerException if either argument is {@code null} diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandle.java b/src/java.base/share/classes/java/lang/invoke/VarHandle.java index f5fae207b93..dda5f999715 100644 --- a/src/java.base/share/classes/java/lang/invoke/VarHandle.java +++ b/src/java.base/share/classes/java/lang/invoke/VarHandle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 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 @@ -2371,9 +2371,9 @@ public abstract sealed class VarHandle implements Constable * Returns a {@linkplain VarHandleDesc} corresponding to a {@link VarHandle} * for an instance field. * - * @param name the unqualified name of the field * @param declaringClass a {@link ClassDesc} describing the declaring class, * for field var handles + * @param name the unqualified name of the field * @param fieldType a {@link ClassDesc} describing the type of the field * @return the {@linkplain VarHandleDesc} * @throws NullPointerException if any of the arguments are null @@ -2390,9 +2390,9 @@ public abstract sealed class VarHandle implements Constable * Returns a {@linkplain VarHandleDesc} corresponding to a {@link VarHandle} * for a static field. * - * @param name the unqualified name of the field * @param declaringClass a {@link ClassDesc} describing the declaring class, * for field var handles + * @param name the unqualified name of the field * @param fieldType a {@link ClassDesc} describing the type of the field * @return the {@linkplain VarHandleDesc} * @throws NullPointerException if any of the arguments are null diff --git a/src/java.base/share/classes/java/security/cert/CertificateRevokedException.java b/src/java.base/share/classes/java/security/cert/CertificateRevokedException.java index 6649dcda6cc..3987786aecd 100644 --- a/src/java.base/share/classes/java/security/cert/CertificateRevokedException.java +++ b/src/java.base/share/classes/java/security/cert/CertificateRevokedException.java @@ -86,12 +86,12 @@ public class CertificateRevokedException extends CertificateException { * @param revocationDate the date on which the certificate was revoked. The * date is copied to protect against subsequent modification. * @param reason the revocation reason - * @param extensions a map of X.509 Extensions. Each key is an OID String - * that maps to the corresponding Extension. The map is copied to - * prevent subsequent modification. * @param authority the {@code X500Principal} that represents the name * of the authority that signed the certificate's revocation status * information + * @param extensions a map of X.509 Extensions. Each key is an OID String + * that maps to the corresponding Extension. The map is copied to + * prevent subsequent modification. * @throws NullPointerException if {@code revocationDate}, * {@code reason}, {@code authority}, or * {@code extensions} is {@code null} diff --git a/src/java.base/share/classes/java/security/interfaces/DSAKeyPairGenerator.java b/src/java.base/share/classes/java/security/interfaces/DSAKeyPairGenerator.java index a4cedf1b54b..d3ab1d0177c 100644 --- a/src/java.base/share/classes/java/security/interfaces/DSAKeyPairGenerator.java +++ b/src/java.base/share/classes/java/security/interfaces/DSAKeyPairGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -105,12 +105,12 @@ public interface DSAKeyPairGenerator { * @param modlen the modulus length in bits. Valid values are any * multiple of 64 between 512 and 1024, inclusive, 2048, and 3072. * - * @param random the random bit source to use to generate key bits; - * can be null. - * * @param genParams whether to generate new parameters for * the modulus length requested. * + * @param random the random bit source to use to generate key bits; + * can be null. + * * @throws InvalidParameterException if {@code modlen} is * invalid, or unsupported, or if {@code genParams} is false and there * are no precomputed parameters for the requested modulus length. diff --git a/src/java.base/share/classes/java/util/Arrays.java b/src/java.base/share/classes/java/util/Arrays.java index 1703d235dfc..589c027b2dc 100644 --- a/src/java.base/share/classes/java/util/Arrays.java +++ b/src/java.base/share/classes/java/util/Arrays.java @@ -3491,8 +3491,8 @@ public final class Arrays { * is greater than that of the original array. * The resulting array is of the class {@code newType}. * - * @param the class of the objects in the original array * @param the class of the objects in the returned array + * @param the class of the objects in the original array * @param original the array to be copied * @param newLength the length of the copy to be returned * @param newType the class of the copy to be returned @@ -3782,8 +3782,8 @@ public final class Arrays { * of the returned array will be {@code to - from}. * The resulting array is of the class {@code newType}. * - * @param the class of the objects in the original array * @param the class of the objects in the returned array + * @param the class of the objects in the original array * @param original the array from which a range is to be copied * @param from the initial index of the range to be copied, inclusive * @param to the final index of the range to be copied, exclusive. diff --git a/src/java.base/share/classes/java/util/stream/Collectors.java b/src/java.base/share/classes/java/util/stream/Collectors.java index c759e243f01..fe20bc1709a 100644 --- a/src/java.base/share/classes/java/util/stream/Collectors.java +++ b/src/java.base/share/classes/java/util/stream/Collectors.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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 @@ -1088,13 +1088,13 @@ public final class Collectors { * * @param the type of the input elements * @param the type of the keys - * @param the intermediate accumulation type of the downstream collector * @param the result type of the downstream reduction + * @param the intermediate accumulation type of the downstream collector * @param the type of the resulting {@code Map} * @param classifier a classifier function mapping input elements to keys - * @param downstream a {@code Collector} implementing the downstream reduction * @param mapFactory a supplier providing a new empty {@code Map} * into which the results will be inserted + * @param downstream a {@code Collector} implementing the downstream reduction * @return a {@code Collector} implementing the cascaded group-by operation * * @see #groupingBy(Function, Collector) @@ -1250,9 +1250,9 @@ public final class Collectors { * @param the result type of the downstream reduction * @param the type of the resulting {@code ConcurrentMap} * @param classifier a classifier function mapping input elements to keys - * @param downstream a {@code Collector} implementing the downstream reduction * @param mapFactory a supplier providing a new empty {@code ConcurrentMap} * into which the results will be inserted + * @param downstream a {@code Collector} implementing the downstream reduction * @return a concurrent, unordered {@code Collector} implementing the cascaded group-by operation * * @see #groupingByConcurrent(Function) @@ -1347,8 +1347,8 @@ public final class Collectors { * applying the finisher function. * * @param the type of the input elements - * @param the intermediate accumulation type of the downstream collector * @param the result type of the downstream reduction + * @param the intermediate accumulation type of the downstream collector * @param predicate a predicate used for classifying input elements * @param downstream a {@code Collector} implementing the downstream * reduction