--- old/src/share/classes/java/security/cert/CertStore.java 2013-06-21 18:29:53.725762792 -0700
+++ new/src/share/classes/java/security/cert/CertStore.java 2013-06-21 18:29:53.569762795 -0700
@@ -38,30 +38,30 @@
import sun.security.jca.GetInstance.Instance;
/**
- * A class for retrieving Certificate
s and CRL
s
+ * A class for retrieving {@code Certificate}s and {@code CRL}s
* from a repository.
*
* This class uses a provider-based architecture.
- * To create a CertStore
, call one of the static
- * getInstance
methods, passing in the type of
- * CertStore
desired, any applicable initialization parameters
+ * To create a {@code CertStore}, call one of the static
+ * {@code getInstance} methods, passing in the type of
+ * {@code CertStore} desired, any applicable initialization parameters
* and optionally the name of the provider desired.
*
- * Once the CertStore
has been created, it can be used to
- * retrieve Certificate
s and CRL
s by calling its
+ * Once the {@code CertStore} has been created, it can be used to
+ * retrieve {@code Certificate}s and {@code CRL}s by calling its
* {@link #getCertificates(CertSelector selector) getCertificates} and
* {@link #getCRLs(CRLSelector selector) getCRLs} methods.
*
* Unlike a {@link java.security.KeyStore KeyStore}, which provides access
* to a cache of private keys and trusted certificates, a
- * CertStore
is designed to provide access to a potentially
+ * {@code CertStore} is designed to provide access to a potentially
* vast repository of untrusted certificates and CRLs. For example, an LDAP
- * implementation of CertStore
provides access to certificates
+ * implementation of {@code CertStore} provides access to certificates
* and CRLs stored in one or more directories using the LDAP protocol and the
* schema as defined in the RFC service attribute.
*
*
Every implementation of the Java platform is required to support the
- * following standard CertStore
type:
+ * following standard {@code CertStore} type:
*
* Concurrent Access *
- * All public methods of CertStore
objects must be thread-safe.
+ * All public methods of {@code CertStore} objects must be thread-safe.
* That is, multiple threads may concurrently invoke these methods on a
- * single CertStore
object (or more than one) with no
- * ill effects. This allows a CertPathBuilder
to search for a
+ * single {@code CertStore} object (or more than one) with no
+ * ill effects. This allows a {@code CertPathBuilder} to search for a
* CRL while simultaneously searching for further certificates, for instance.
*
* The static methods of this class are also guaranteed to be thread-safe.
@@ -104,13 +104,13 @@
private CertStoreParameters params;
/**
- * Creates a CertStore
object of the given type, and
+ * Creates a {@code CertStore} object of the given type, and
* encapsulates the given provider implementation (SPI object) in it.
*
* @param storeSpi the provider implementation
* @param provider the provider
* @param type the type
- * @param params the initialization parameters (may be null
)
+ * @param params the initialization parameters (may be {@code null})
*/
protected CertStore(CertStoreSpi storeSpi, Provider provider,
String type, CertStoreParameters params) {
@@ -122,28 +122,28 @@
}
/**
- * Returns a Collection
of Certificate
s that
- * match the specified selector. If no Certificate
s
- * match the selector, an empty Collection
will be returned.
+ * Returns a {@code Collection} of {@code Certificate}s that
+ * match the specified selector. If no {@code Certificate}s
+ * match the selector, an empty {@code Collection} will be returned.
*
- * For some CertStore
types, the resulting
- * Collection
may not contain all of the
- * Certificate
s that match the selector. For instance,
- * an LDAP CertStore
may not search all entries in the
+ * For some {@code CertStore} types, the resulting
+ * {@code Collection} may not contain all of the
+ * {@code Certificate}s that match the selector. For instance,
+ * an LDAP {@code CertStore} may not search all entries in the
* directory. Instead, it may just search entries that are likely to
- * contain the Certificate
s it is looking for.
+ * contain the {@code Certificate}s it is looking for.
*
- * Some CertStore
implementations (especially LDAP
- * CertStore
s) may throw a CertStoreException
- * unless a non-null CertSelector
is provided that
+ * Some {@code CertStore} implementations (especially LDAP
+ * {@code CertStore}s) may throw a {@code CertStoreException}
+ * unless a non-null {@code CertSelector} is provided that
* includes specific criteria that can be used to find the certificates.
* Issuer and/or subject names are especially useful criteria.
*
- * @param selector A CertSelector
used to select which
- * Certificate
s should be returned. Specify null
- * to return all Certificate
s (if supported).
- * @return A Collection
of Certificate
s that
- * match the specified selector (never null
)
+ * @param selector A {@code CertSelector} used to select which
+ * {@code Certificate}s should be returned. Specify {@code null}
+ * to return all {@code Certificate}s (if supported).
+ * @return A {@code Collection} of {@code Certificate}s that
+ * match the specified selector (never {@code null})
* @throws CertStoreException if an exception occurs
*/
public final Collection extends Certificate> getCertificates
@@ -152,28 +152,28 @@
}
/**
- * Returns a Collection
of CRL
s that
- * match the specified selector. If no CRL
s
- * match the selector, an empty Collection
will be returned.
+ * Returns a {@code Collection} of {@code CRL}s that
+ * match the specified selector. If no {@code CRL}s
+ * match the selector, an empty {@code Collection} will be returned.
*
- * For some CertStore
types, the resulting
- * Collection
may not contain all of the
- * CRL
s that match the selector. For instance,
- * an LDAP CertStore
may not search all entries in the
+ * For some {@code CertStore} types, the resulting
+ * {@code Collection} may not contain all of the
+ * {@code CRL}s that match the selector. For instance,
+ * an LDAP {@code CertStore} may not search all entries in the
* directory. Instead, it may just search entries that are likely to
- * contain the CRL
s it is looking for.
+ * contain the {@code CRL}s it is looking for.
*
- * Some CertStore
implementations (especially LDAP
- * CertStore
s) may throw a CertStoreException
- * unless a non-null CRLSelector
is provided that
+ * Some {@code CertStore} implementations (especially LDAP
+ * {@code CertStore}s) may throw a {@code CertStoreException}
+ * unless a non-null {@code CRLSelector} is provided that
* includes specific criteria that can be used to find the CRLs.
* Issuer names and/or the certificate to be checked are especially useful.
*
- * @param selector A CRLSelector
used to select which
- * CRL
s should be returned. Specify null
- * to return all CRL
s (if supported).
- * @return A Collection
of CRL
s that
- * match the specified selector (never null
)
+ * @param selector A {@code CRLSelector} used to select which
+ * {@code CRL}s should be returned. Specify {@code null}
+ * to return all {@code CRL}s (if supported).
+ * @return A {@code Collection} of {@code CRL}s that
+ * match the specified selector (never {@code null})
* @throws CertStoreException if an exception occurs
*/
public final Collection extends CRL> getCRLs(CRLSelector selector)
@@ -182,8 +182,8 @@
}
/**
- * Returns a CertStore
object that implements the specified
- * CertStore
type and is initialized with the specified
+ * Returns a {@code CertStore} object that implements the specified
+ * {@code CertStore} type and is initialized with the specified
* parameters.
*
*
This method traverses the list of registered security Providers, @@ -195,29 +195,29 @@ *
Note that the list of registered providers may be retrieved via * the {@link Security#getProviders() Security.getProviders()} method. * - *
The CertStore
that is returned is initialized with the
- * specified CertStoreParameters
. The type of parameters
- * needed may vary between different types of CertStore
s.
- * Note that the specified CertStoreParameters
object is
+ *
The {@code CertStore} that is returned is initialized with the
+ * specified {@code CertStoreParameters}. The type of parameters
+ * needed may vary between different types of {@code CertStore}s.
+ * Note that the specified {@code CertStoreParameters} object is
* cloned.
*
- * @param type the name of the requested CertStore
type.
+ * @param type the name of the requested {@code CertStore} type.
* See the CertStore section in the
* Java Cryptography Architecture Standard Algorithm Name Documentation
* for information about standard types.
*
- * @param params the initialization parameters (may be null
).
+ * @param params the initialization parameters (may be {@code null}).
*
- * @return a CertStore
object that implements the specified
- * CertStore
type.
+ * @return a {@code CertStore} object that implements the specified
+ * {@code CertStore} type.
*
* @throws NoSuchAlgorithmException if no Provider supports a
* CertStoreSpi implementation for the specified type.
*
* @throws InvalidAlgorithmParameterException if the specified
* initialization parameters are inappropriate for this
- * CertStore
.
+ * {@code CertStore}.
*
* @see java.security.Provider
*/
@@ -244,8 +244,8 @@
}
/**
- * Returns a CertStore
object that implements the specified
- * CertStore
type.
+ * Returns a {@code CertStore} object that implements the specified
+ * {@code CertStore} type.
*
*
A new CertStore object encapsulating the * CertStoreSpi implementation from the specified provider @@ -255,23 +255,23 @@ *
Note that the list of registered providers may be retrieved via * the {@link Security#getProviders() Security.getProviders()} method. * - *
The CertStore
that is returned is initialized with the
- * specified CertStoreParameters
. The type of parameters
- * needed may vary between different types of CertStore
s.
- * Note that the specified CertStoreParameters
object is
+ *
The {@code CertStore} that is returned is initialized with the
+ * specified {@code CertStoreParameters}. The type of parameters
+ * needed may vary between different types of {@code CertStore}s.
+ * Note that the specified {@code CertStoreParameters} object is
* cloned.
*
- * @param type the requested CertStore
type.
+ * @param type the requested {@code CertStore} type.
* See the CertStore section in the
* Java Cryptography Architecture Standard Algorithm Name Documentation
* for information about standard types.
*
- * @param params the initialization parameters (may be null
).
+ * @param params the initialization parameters (may be {@code null}).
*
* @param provider the name of the provider.
*
- * @return a CertStore
object that implements the
+ * @return a {@code CertStore} object that implements the
* specified type.
*
* @throws NoSuchAlgorithmException if a CertStoreSpi
@@ -280,12 +280,12 @@
*
* @throws InvalidAlgorithmParameterException if the specified
* initialization parameters are inappropriate for this
- * CertStore
.
+ * {@code CertStore}.
*
* @throws NoSuchProviderException if the specified provider is not
* registered in the security provider list.
*
- * @exception IllegalArgumentException if the provider
is
+ * @exception IllegalArgumentException if the {@code provider} is
* null or empty.
*
* @see java.security.Provider
@@ -305,31 +305,31 @@
}
/**
- * Returns a CertStore
object that implements the specified
- * CertStore
type.
+ * Returns a {@code CertStore} object that implements the specified
+ * {@code CertStore} type.
*
*
A new CertStore object encapsulating the * CertStoreSpi implementation from the specified Provider * object is returned. Note that the specified Provider object * does not have to be registered in the provider list. * - *
The CertStore
that is returned is initialized with the
- * specified CertStoreParameters
. The type of parameters
- * needed may vary between different types of CertStore
s.
- * Note that the specified CertStoreParameters
object is
+ *
The {@code CertStore} that is returned is initialized with the
+ * specified {@code CertStoreParameters}. The type of parameters
+ * needed may vary between different types of {@code CertStore}s.
+ * Note that the specified {@code CertStoreParameters} object is
* cloned.
*
- * @param type the requested CertStore
type.
+ * @param type the requested {@code CertStore} type.
* See the CertStore section in the
* Java Cryptography Architecture Standard Algorithm Name Documentation
* for information about standard types.
*
- * @param params the initialization parameters (may be null
).
+ * @param params the initialization parameters (may be {@code null}).
*
* @param provider the provider.
*
- * @return a CertStore
object that implements the
+ * @return a {@code CertStore} object that implements the
* specified type.
*
* @exception NoSuchAlgorithmException if a CertStoreSpi
@@ -338,9 +338,9 @@
*
* @throws InvalidAlgorithmParameterException if the specified
* initialization parameters are inappropriate for this
- * CertStore
+ * {@code CertStore}
*
- * @exception IllegalArgumentException if the provider
is
+ * @exception IllegalArgumentException if the {@code provider} is
* null.
*
* @see java.security.Provider
@@ -359,30 +359,30 @@
}
/**
- * Returns the parameters used to initialize this CertStore
.
- * Note that the CertStoreParameters
object is cloned before
+ * Returns the parameters used to initialize this {@code CertStore}.
+ * Note that the {@code CertStoreParameters} object is cloned before
* it is returned.
*
- * @return the parameters used to initialize this CertStore
- * (may be null
)
+ * @return the parameters used to initialize this {@code CertStore}
+ * (may be {@code null})
*/
public final CertStoreParameters getCertStoreParameters() {
return (params == null ? null : (CertStoreParameters) params.clone());
}
/**
- * Returns the type of this CertStore
.
+ * Returns the type of this {@code CertStore}.
*
- * @return the type of this CertStore
+ * @return the type of this {@code CertStore}
*/
public final String getType() {
return this.type;
}
/**
- * Returns the provider of this CertStore
.
+ * Returns the provider of this {@code CertStore}.
*
- * @return the provider of this CertStore
+ * @return the provider of this {@code CertStore}
*/
public final Provider getProvider() {
return this.provider;