HADOOP-16098. Fix javadoc warnings in hadoop-aws. Contributed by Masatake Iwasaki.

This commit is contained in:
Masatake Iwasaki 2019-02-12 06:07:47 +09:00
parent ca4e46a05e
commit 6c999fe4b0
18 changed files with 31 additions and 5 deletions

View File

@ -146,7 +146,8 @@ public static void clearInconsistency(S3AFileSystem fs) throws Exception {
/** /**
* A way for tests to patch in a different fault injection policy at runtime. * A way for tests to patch in a different fault injection policy at runtime.
* @param fs filesystem under test * @param fs filesystem under test
* * @param policy failure injection settings to set
* @throws Exception on failure
*/ */
public static void setFailureInjectionPolicy(S3AFileSystem fs, public static void setFailureInjectionPolicy(S3AFileSystem fs,
FailureInjectionPolicy policy) throws Exception { FailureInjectionPolicy policy) throws Exception {

View File

@ -28,7 +28,7 @@
/** /**
* Constants for internal use in the org.apache.hadoop.fs.s3a module itself. * Constants for internal use in the org.apache.hadoop.fs.s3a module itself.
* Please don't refer to these outside of this module & its tests. * Please don't refer to these outside of this module & its tests.
* If you find you need to then either the code is doing something it * If you find you need to then either the code is doing something it
* should not, or these constants need to be uprated to being * should not, or these constants need to be uprated to being
* public and stable entries. * public and stable entries.

View File

@ -75,7 +75,7 @@ public S3AOpContext(boolean isS3GuardEnabled, Invoker invoker,
* @param invoker invoker, which contains retry policy * @param invoker invoker, which contains retry policy
* @param stats optional stats object * @param stats optional stats object
* @param instrumentation instrumentation to use * @param instrumentation instrumentation to use
* @param dstFileStatus * @param dstFileStatus file status from existence check
*/ */
public S3AOpContext(boolean isS3GuardEnabled, Invoker invoker, public S3AOpContext(boolean isS3GuardEnabled, Invoker invoker,
@Nullable FileSystem.Statistics stats, S3AInstrumentation instrumentation, @Nullable FileSystem.Statistics stats, S3AInstrumentation instrumentation,

View File

@ -112,7 +112,7 @@ public S3AInputPolicy getInputPolicy() {
/** /**
* Get the readahead for this operation. * Get the readahead for this operation.
* @return a value >= 0 * @return a value {@literal >=} 0
*/ */
public long getReadahead() { public long getReadahead() {
return readahead; return readahead;

View File

@ -1226,6 +1226,7 @@ public static void deleteWithWarning(FileSystem fs,
* @param conf The Hadoop configuration * @param conf The Hadoop configuration
* @param bucket Optional bucket to use to look up per-bucket proxy secrets * @param bucket Optional bucket to use to look up per-bucket proxy secrets
* @return new AWS client configuration * @return new AWS client configuration
* @throws IOException problem creating AWS client configuration
*/ */
public static ClientConfiguration createAwsConf(Configuration conf, public static ClientConfiguration createAwsConf(Configuration conf,
String bucket) String bucket)

View File

@ -58,6 +58,7 @@ public class TemporaryAWSCredentialsProvider extends
/** /**
* Construct from just a configuration. * Construct from just a configuration.
* @param conf configuration. * @param conf configuration.
* @throws IOException on any failure to load the credentials.
*/ */
public TemporaryAWSCredentialsProvider(final Configuration conf) public TemporaryAWSCredentialsProvider(final Configuration conf)
throws IOException { throws IOException {
@ -69,6 +70,7 @@ public TemporaryAWSCredentialsProvider(final Configuration conf)
* to a filesystem. * to a filesystem.
* @param uri binding to a filesystem URI. * @param uri binding to a filesystem URI.
* @param conf configuration. * @param conf configuration.
* @throws IOException on any failure to load the credentials.
*/ */
public TemporaryAWSCredentialsProvider( public TemporaryAWSCredentialsProvider(
@Nullable final URI uri, @Nullable final URI uri,

View File

@ -66,6 +66,7 @@ public AbstractSessionCredentialsProvider(
/** /**
* Initialize the credentials by calling * Initialize the credentials by calling
* {@link #createCredentials(Configuration)} with the current config. * {@link #createCredentials(Configuration)} with the current config.
* @throws IOException on any failure.
*/ */
@Retries.OnceTranslated @Retries.OnceTranslated
protected void init() throws IOException { protected void init() throws IOException {

View File

@ -66,6 +66,7 @@ private MarshalledCredentialBinding() {
* Create a set of marshalled credentials from a set of credentials * Create a set of marshalled credentials from a set of credentials
* issued by an STS call. * issued by an STS call.
* @param credentials AWS-provided session credentials * @param credentials AWS-provided session credentials
* @return a set of marshalled credentials.
*/ */
public static MarshalledCredentials fromSTSCredentials( public static MarshalledCredentials fromSTSCredentials(
final Credentials credentials) { final Credentials credentials) {
@ -117,6 +118,7 @@ private static String nullToEmptyString(final String src) {
* Loads the credentials from the owning S3A FS, including * Loads the credentials from the owning S3A FS, including
* from Hadoop credential providers. * from Hadoop credential providers.
* There is no validation. * There is no validation.
* @param uri binding URI
* @param conf configuration to load from * @param conf configuration to load from
* @return the component * @return the component
* @throws IOException on any load failure * @throws IOException on any load failure
@ -176,6 +178,7 @@ public static AWSCredentials toAWSCredentials(
/** /**
* Request a set of credentials from an STS endpoint. * Request a set of credentials from an STS endpoint.
* @param parentCredentials the parent credentials needed to talk to STS * @param parentCredentials the parent credentials needed to talk to STS
* @param awsConf AWS client configuration
* @param stsEndpoint an endpoint, use "" for none * @param stsEndpoint an endpoint, use "" for none
* @param stsRegion region; use if the endpoint isn't the AWS default. * @param stsRegion region; use if the endpoint isn't the AWS default.
* @param duration duration of the credentials in seconds. Minimum value: 900. * @param duration duration of the credentials in seconds. Minimum value: 900.

View File

@ -197,6 +197,7 @@ public static Statement statement(boolean allow,
* @param allow allow or deny * @param allow allow or deny
* @param path path * @param path path
* @param isDirectory is this a directory? * @param isDirectory is this a directory?
* @param wildcards add a * to the tail of the key?
* @param actions action * @param actions action
* @return the formatted json statement * @return the formatted json statement
*/ */
@ -220,6 +221,7 @@ public static Statement statement(
* @param allow allow or deny * @param allow allow or deny
* @param path path * @param path path
* @param isDirectory is this a directory? * @param isDirectory is this a directory?
* @param wildcards add a * to the tail of the key?
* @param actions action * @param actions action
* @return the formatted json statement * @return the formatted json statement
*/ */

View File

@ -173,8 +173,10 @@ public abstract AbstractS3ATokenIdentifier createTokenIdentifier(
* Verify that a token identifier is of a specific class. * Verify that a token identifier is of a specific class.
* This will reject subclasses (i.e. it is stricter than * This will reject subclasses (i.e. it is stricter than
* {@code instanceof}, then cast it to that type. * {@code instanceof}, then cast it to that type.
* @param <T> type of S3A delegation ttoken identifier.
* @param identifier identifier to validate * @param identifier identifier to validate
* @param expectedClass class of the expected token identifier. * @param expectedClass class of the expected token identifier.
* @return token identifier.
* @throws DelegationTokenIOException If the wrong class was found. * @throws DelegationTokenIOException If the wrong class was found.
*/ */
protected <T extends AbstractS3ATokenIdentifier> T convertTokenIdentifier( protected <T extends AbstractS3ATokenIdentifier> T convertTokenIdentifier(

View File

@ -140,6 +140,7 @@ protected AbstractS3ATokenIdentifier(
* Build from a token. * Build from a token.
* This has been written for refresh operations; * This has been written for refresh operations;
* if someone implements refresh it will be relevant. * if someone implements refresh it will be relevant.
* @param kind token kind.
* @param token to to build from * @param token to to build from
* @throws IOException failure to build the identifier. * @throws IOException failure to build the identifier.
*/ */
@ -153,6 +154,7 @@ protected AbstractS3ATokenIdentifier(
/** /**
* For subclasses to use in their own empty-constructors. * For subclasses to use in their own empty-constructors.
* @param kind token kind.
*/ */
protected AbstractS3ATokenIdentifier(final Text kind) { protected AbstractS3ATokenIdentifier(final Text kind) {
super(kind); super(kind);

View File

@ -146,6 +146,7 @@ public class S3ADelegationTokens extends AbstractDTService {
/** /**
* Instantiate. * Instantiate.
* @throws IOException if login fails.
*/ */
public S3ADelegationTokens() throws IOException { public S3ADelegationTokens() throws IOException {
super("S3ADelegationTokens"); super("S3ADelegationTokens");

View File

@ -332,6 +332,7 @@ private synchronized Optional<STSClientFactory.STSClient> maybeInitSTS()
/** /**
* Get the client to AWS STS. * Get the client to AWS STS.
* @return the STS client, when successfully inited. * @return the STS client, when successfully inited.
* @throws IOException any failure to bind to STS.
*/ */
protected Optional<STSClientFactory.STSClient> prepareSTSClient() protected Optional<STSClientFactory.STSClient> prepareSTSClient()
throws IOException { throws IOException {
@ -397,6 +398,7 @@ public SessionTokenIdentifier createEmptyIdentifier() {
* Expiration date time as passed in from source. * Expiration date time as passed in from source.
* If unset, either we are unbound, or the token which came in does not * If unset, either we are unbound, or the token which came in does not
* know its expiry. * know its expiry.
* @return expiration data time.
*/ */
protected Optional<OffsetDateTime> getExpirationDateTime() { protected Optional<OffsetDateTime> getExpirationDateTime() {
return expirationDateTime; return expirationDateTime;
@ -409,6 +411,7 @@ protected void setExpirationDateTime(
/** /**
* Token identifier bound to. * Token identifier bound to.
* @return token identifier.
*/ */
protected Optional<SessionTokenIdentifier> getTokenIdentifier() { protected Optional<SessionTokenIdentifier> getTokenIdentifier() {
return tokenIdentifier; return tokenIdentifier;

View File

@ -94,6 +94,8 @@ public SessionTokenIdentifier(
* Constructor. * Constructor.
* @param kind token kind. * @param kind token kind.
* @param owner token owner * @param owner token owner
* @param renewer token renewer
* @param realUser real user running over proxy user
* @param uri filesystem URI. * @param uri filesystem URI.
*/ */
public SessionTokenIdentifier(final Text kind, public SessionTokenIdentifier(final Text kind,

View File

@ -67,6 +67,7 @@ public class DirListingMetadata extends ExpirableMetadata {
* @param isAuthoritative true iff listing is the full contents of the * @param isAuthoritative true iff listing is the full contents of the
* directory, and the calling client reports that this may be cached as * directory, and the calling client reports that this may be cached as
* the full and authoritative listing of all files in the directory. * the full and authoritative listing of all files in the directory.
* @param lastUpdated last updated time on which expiration is based.
*/ */
public DirListingMetadata(Path path, Collection<PathMetadata> listing, public DirListingMetadata(Path path, Collection<PathMetadata> listing,
boolean isAuthoritative, long lastUpdated) { boolean isAuthoritative, long lastUpdated) {

View File

@ -189,6 +189,7 @@ public static FileStatus[] dirMetaToStatuses(DirListingMetadata dirMeta) {
* @param backingStatuses Directory listing from the backing store. * @param backingStatuses Directory listing from the backing store.
* @param dirMeta Directory listing from MetadataStore. May be null. * @param dirMeta Directory listing from MetadataStore. May be null.
* @param isAuthoritative State of authoritative mode * @param isAuthoritative State of authoritative mode
* @param timeProvider Time provider for testing.
* @return Final result of directory listing. * @return Final result of directory listing.
* @throws IOException if metadata store update failed * @throws IOException if metadata store update failed
*/ */
@ -279,6 +280,7 @@ public static boolean isNullMetadataStore(MetadataStore ms) {
* dir. * dir.
* @param owner Hadoop user name. * @param owner Hadoop user name.
* @param authoritative Whether to mark new directories as authoritative. * @param authoritative Whether to mark new directories as authoritative.
* @param timeProvider Time provider for testing.
*/ */
@Deprecated @Deprecated
@Retries.OnceExceptionsSwallowed @Retries.OnceExceptionsSwallowed

View File

@ -145,6 +145,7 @@ protected S3GuardTool(Configuration conf, String...opts) {
/** /**
* Return sub-command name. * Return sub-command name.
* @return sub-dommand name.
*/ */
public abstract String getName(); public abstract String getName();
@ -250,6 +251,7 @@ protected void checkIfS3BucketIsGuarded(List<String> paths)
/** /**
* Check if bucket or DDB table name is set. * Check if bucket or DDB table name is set.
* @param paths position arguments in which S3 path is provided.
*/ */
protected void checkBucketNameOrDDBTableNameProvided(List<String> paths) { protected void checkBucketNameOrDDBTableNameProvided(List<String> paths) {
String s3Path = null; String s3Path = null;
@ -270,6 +272,7 @@ protected void checkBucketNameOrDDBTableNameProvided(List<String> paths) {
* *
* @param forceCreate override the auto-creation setting to true. * @param forceCreate override the auto-creation setting to true.
* @return a initialized metadata store. * @return a initialized metadata store.
* @throws IOException on unsupported metadata store.
*/ */
protected MetadataStore initMetadataStore(boolean forceCreate) protected MetadataStore initMetadataStore(boolean forceCreate)
throws IOException { throws IOException {

View File

@ -30,7 +30,7 @@
/** /**
* Constants for internal use in the org.apache.hadoop.fs.s3a module itself. * Constants for internal use in the org.apache.hadoop.fs.s3a module itself.
* Please don't refer to these outside of this module & its tests. * Please don't refer to these outside of this module &amp; its tests.
* If you find you need to then either the code is doing something it * If you find you need to then either the code is doing something it
* should not, or these constants need to be uprated to being * should not, or these constants need to be uprated to being
* public and stable entries. * public and stable entries.