# HG changeset patch # User juh # Date 1378749176 25200 # Node ID b4f91bc595fe99f9fbb469b713ab41d0d0da3e5d # Parent 082c76535c1f4edc6b5c192d52935070abbd22c2 8024432: Fix doclint issues in java.security Reviewed-by: darcy, mullan diff -r 082c76535c1f -r b4f91bc595fe jdk/src/share/classes/java/security/AccessController.java --- a/jdk/src/share/classes/java/security/AccessController.java Mon Sep 09 13:44:30 2013 +0100 +++ b/jdk/src/share/classes/java/security/AccessController.java Mon Sep 09 10:52:56 2013 -0700 @@ -279,6 +279,9 @@ *

Note that any DomainCombiner associated with the current * AccessControlContext will be ignored while the action is performed. * + * @param the type of the value returned by the PrivilegedAction's + * {@code run} method. + * * @param action the action to be performed. * * @return the value returned by the action's {@code run} method. @@ -305,6 +308,9 @@ *

This method preserves the current AccessControlContext's * DomainCombiner (which may be null) while the action is performed. * + * @param the type of the value returned by the PrivilegedAction's + * {@code run} method. + * * @param action the action to be performed. * * @return the value returned by the action's {@code run} method. @@ -344,6 +350,8 @@ * {@link java.security.SecurityPermission}, then the action is performed * with no permissions. * + * @param the type of the value returned by the PrivilegedAction's + * {@code run} method. * @param action the action to be performed. * @param context an access control context * representing the restriction to be applied to the @@ -377,6 +385,8 @@ * If the action's {@code run} method throws an (unchecked) exception, * it will propagate through this method. * + * @param the type of the value returned by the PrivilegedAction's + * {@code run} method. * @param action the action to be performed. * @param context an access control context * representing the restriction to be applied to the @@ -429,6 +439,8 @@ *

This method preserves the current AccessControlContext's * DomainCombiner (which may be null) while the action is performed. * + * @param the type of the value returned by the PrivilegedAction's + * {@code run} method. * @param action the action to be performed. * @param context an access control context * representing the restriction to be applied to the @@ -479,6 +491,9 @@ *

Note that any DomainCombiner associated with the current * AccessControlContext will be ignored while the action is performed. * + * @param the type of the value returned by the + * PrivilegedExceptionAction's {@code run} method. + * * @param action the action to be performed * * @return the value returned by the action's {@code run} method @@ -509,6 +524,9 @@ *

This method preserves the current AccessControlContext's * DomainCombiner (which may be null) while the action is performed. * + * @param the type of the value returned by the + * PrivilegedExceptionAction's {@code run} method. + * * @param action the action to be performed. * * @return the value returned by the action's {@code run} method @@ -585,6 +603,8 @@ * {@link java.security.SecurityPermission}, then the action is performed * with no permissions. * + * @param the type of the value returned by the + * PrivilegedExceptionAction's {@code run} method. * @param action the action to be performed * @param context an access control context * representing the restriction to be applied to the @@ -622,6 +642,8 @@ * If the action's {@code run} method throws an (unchecked) exception, * it will propagate through this method. * + * @param the type of the value returned by the + * PrivilegedExceptionAction's {@code run} method. * @param action the action to be performed. * @param context an access control context * representing the restriction to be applied to the @@ -676,6 +698,8 @@ *

This method preserves the current AccessControlContext's * DomainCombiner (which may be null) while the action is performed. * + * @param the type of the value returned by the + * PrivilegedExceptionAction's {@code run} method. * @param action the action to be performed. * @param context an access control context * representing the restriction to be applied to the diff -r 082c76535c1f -r b4f91bc595fe jdk/src/share/classes/java/security/AlgorithmParameters.java --- a/jdk/src/share/classes/java/security/AlgorithmParameters.java Mon Sep 09 13:44:30 2013 +0100 +++ b/jdk/src/share/classes/java/security/AlgorithmParameters.java Mon Sep 09 10:52:56 2013 -0700 @@ -324,6 +324,7 @@ * parameters should be returned in an instance of the * {@code DSAParameterSpec} class. * + * @param the type of the parameter specification to be returrned * @param paramSpec the specification class in which * the parameters should be returned. * diff -r 082c76535c1f -r b4f91bc595fe jdk/src/share/classes/java/security/AlgorithmParametersSpi.java --- a/jdk/src/share/classes/java/security/AlgorithmParametersSpi.java Mon Sep 09 13:44:30 2013 +0100 +++ b/jdk/src/share/classes/java/security/AlgorithmParametersSpi.java Mon Sep 09 10:52:56 2013 -0700 @@ -102,6 +102,8 @@ * parameters should be returned in an instance of the * {@code DSAParameterSpec} class. * + * @param the type of the parameter specification to be returned + * * @param paramSpec the specification class in which * the parameters should be returned. * diff -r 082c76535c1f -r b4f91bc595fe jdk/src/share/classes/java/security/KeyFactory.java --- a/jdk/src/share/classes/java/security/KeyFactory.java Mon Sep 09 13:44:30 2013 +0100 +++ b/jdk/src/share/classes/java/security/KeyFactory.java Mon Sep 09 10:52:56 2013 -0700 @@ -395,6 +395,8 @@ * key material should be returned in an instance of the * {@code DSAPublicKeySpec} class. * + * @param the type of the key specification to be returned + * * @param key the key. * * @param keySpec the specification class in which diff -r 082c76535c1f -r b4f91bc595fe jdk/src/share/classes/java/security/KeyFactorySpi.java --- a/jdk/src/share/classes/java/security/KeyFactorySpi.java Mon Sep 09 13:44:30 2013 +0100 +++ b/jdk/src/share/classes/java/security/KeyFactorySpi.java Mon Sep 09 10:52:56 2013 -0700 @@ -106,6 +106,8 @@ * key material should be returned in an instance of the * {@code DSAPublicKeySpec} class. * + * @param the type of the key specification to be returned + * * @param key the key. * * @param keySpec the specification class in which diff -r 082c76535c1f -r b4f91bc595fe jdk/src/share/classes/java/security/KeyStore.java --- a/jdk/src/share/classes/java/security/KeyStore.java Mon Sep 09 13:44:30 2013 +0100 +++ b/jdk/src/share/classes/java/security/KeyStore.java Mon Sep 09 10:52:56 2013 -0700 @@ -1753,6 +1753,7 @@ /** * Returns the KeyStore described by this object. * + * @return the {@code KeyStore} described by this object * @exception KeyStoreException if an error occured during the * operation, for example if the KeyStore could not be * instantiated or loaded diff -r 082c76535c1f -r b4f91bc595fe jdk/src/share/classes/java/security/Principal.java --- a/jdk/src/share/classes/java/security/Principal.java Mon Sep 09 13:44:30 2013 +0100 +++ b/jdk/src/share/classes/java/security/Principal.java Mon Sep 09 10:52:56 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, 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 @@ -81,6 +81,7 @@ *

Subclasses may override this with a different implementation, if * necessary. * + * @param subject the {@code Subject} * @return true if {@code subject} is non-null and is * implied by this principal, or false otherwise. * @since 1.8 diff -r 082c76535c1f -r b4f91bc595fe jdk/src/share/classes/java/security/cert/CertPathBuilderSpi.java --- a/jdk/src/share/classes/java/security/cert/CertPathBuilderSpi.java Mon Sep 09 13:44:30 2013 +0100 +++ b/jdk/src/share/classes/java/security/cert/CertPathBuilderSpi.java Mon Sep 09 10:52:56 2013 -0700 @@ -87,6 +87,8 @@ * service providers, this method cannot be abstract and by default throws * an {@code UnsupportedOperationException}. * + * @return a {@code CertPathChecker} that this implementation uses to + * check the revocation status of certificates * @throws UnsupportedOperationException if this method is not supported * @since 1.8 */ diff -r 082c76535c1f -r b4f91bc595fe jdk/src/share/classes/java/security/cert/CertPathValidatorSpi.java --- a/jdk/src/share/classes/java/security/cert/CertPathValidatorSpi.java Mon Sep 09 13:44:30 2013 +0100 +++ b/jdk/src/share/classes/java/security/cert/CertPathValidatorSpi.java Mon Sep 09 10:52:56 2013 -0700 @@ -97,6 +97,8 @@ * service providers, this method cannot be abstract and by default throws * an {@code UnsupportedOperationException}. * + * @return a {@code CertPathChecker} that this implementation uses to + * check the revocation status of certificates * @throws UnsupportedOperationException if this method is not supported * @since 1.8 */ diff -r 082c76535c1f -r b4f91bc595fe jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java --- a/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java Mon Sep 09 13:44:30 2013 +0100 +++ b/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java Mon Sep 09 10:52:56 2013 -0700 @@ -103,6 +103,9 @@ private Map ocspResponses = Collections.emptyMap(); private Set