Skip to content

Commit fc74d55

Browse files
committed
HADOOP-16202 style and javadoc warnings
Change-Id: I1e454d3244ffab8c248584edfb1f539ebac596c7
1 parent 7b56861 commit fc74d55

File tree

8 files changed

+18
-20
lines changed

8 files changed

+18
-20
lines changed

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FutureDataInputStreamBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
* Builder for input streams and subclasses whose return value is
2929
* actually a completable future: this allows for better asynchronous
3030
* operation.
31-
* <p></p>
31+
*
3232
* To be more generic, {@link #opt(String, int)} and {@link #must(String, int)}
3333
* variants provide implementation-agnostic way to customize the builder.
3434
* Each FS-specific builder implementation can interpret the FS-specific
3535
* options accordingly, for example:
36-
* <p></p>
36+
*
3737
* If the option is not related to the file system, the option will be ignored.
3838
* If the option is must, but not supported/known by the file system, an
3939
* {@link IllegalArgumentException} will be thrown.

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/AbstractFSBuilderImpl.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,18 @@
4242
/**
4343
* Builder for filesystem/filecontext operations of various kinds,
4444
* with option support.
45-
* <p></p>
46-
* <pre>
45+
*
46+
* <code>
4747
* .opt("foofs:option.a", true)
4848
* .opt("foofs:option.b", "value")
4949
* .opt("fs.s3a.open.option.etag", "9fe4c37c25b")
5050
* .must("foofs:cache", true)
5151
* .must("barfs:cache-size", 256 * 1024 * 1024)
5252
* .build();
53-
* </pre>
54-
* <p></p>
53+
* </code>
5554
*
5655
* Configuration keys declared in an {@code opt()} may be ignored by
5756
* a builder which does not recognise them.
58-
* <p></p>
5957
*
6058
* Configuration keys declared in a {@code must()} function set must
6159
* be understood by the implementation or a

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/impl/FutureDataInputStreamBuilderImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,16 @@
4141
* Builder for input streams and subclasses whose return value is
4242
* actually a completable future: this allows for better asynchronous
4343
* operation.
44-
* <p></p>
44+
*
4545
* To be more generic, {@link #opt(String, int)} and {@link #must(String, int)}
4646
* variants provide implementation-agnostic way to customize the builder.
4747
* Each FS-specific builder implementation can interpret the FS-specific
4848
* options accordingly, for example:
49-
* <p></p>
49+
*
5050
* If the option is not related to the file system, the option will be ignored.
5151
* If the option is must, but not supported/known by the file system, an
5252
* {@link IllegalArgumentException} will be thrown.
53+
*
5354
*/
5455
@InterfaceAudience.Public
5556
@InterfaceStability.Unstable

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractOpenTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,8 @@ public void testOpenFileApplyAsyncRead() throws Throwable {
343343
@Test
344344
public void testOpenFileNullStatusButFileLength() throws Throwable {
345345
describe("use openFile() with a null status and expect the status to be"
346-
+ " ignored. block size, fadvise and length are passed in as must() options");
346+
+ " ignored. block size, fadvise and length are passed in as"
347+
+ " must() options");
347348
Path path = path("testOpenFileNullStatus");
348349
FileSystem fs = getFileSystem();
349350
int len = 4;

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryCopyService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737

3838
import static org.apache.hadoop.fs.Options.OpenFileOptions.FS_OPTION_OPENFILE_FADVISE;
3939
import static org.apache.hadoop.fs.Options.OpenFileOptions.FS_OPTION_OPENFILE_FADVISE_SEQUENTIAL;
40-
import static org.apache.hadoop.fs.Options.OpenFileOptions.FS_OPTION_OPENFILE_LENGTH;
4140
import static org.apache.hadoop.fs.impl.FutureIOSupport.awaitFuture;
4241

4342
/**

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/impl/S3AOpenFileOperation.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,8 @@ public OpenFileInformation prepareToOpenFile(
312312

313313
/**
314314
* Open a simple file.
315-
* @return the parameters needed to open a file through open(path, bufferSize).
315+
* @return the parameters needed to open a file through
316+
* {@code open(path, bufferSize)}.
316317
* @param bufferSize buffer size
317318
*/
318319
public OpenFileInformation openSimpleFile(final int bufferSize,

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractSeek.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Arrays;
2525
import java.util.Collection;
2626

27-
import org.assertj.core.api.Assertions;
2827
import org.junit.Before;
2928
import org.junit.Test;
3029
import org.junit.runner.RunWith;
@@ -45,7 +44,6 @@
4544
import org.apache.hadoop.security.ssl.DelegatingSSLSocketFactory;
4645
import org.apache.hadoop.util.NativeCodeLoader;
4746

48-
import static org.apache.hadoop.fs.Options.OpenFileOptions.FS_OPTION_OPENFILE_FADVISE;
4947
import static org.apache.hadoop.thirdparty.com.google.common.base.Preconditions.checkNotNull;
5048
import static org.apache.hadoop.fs.s3a.Constants.INPUT_FADVISE;
5149
import static org.apache.hadoop.fs.s3a.Constants.INPUT_FADV_NORMAL;

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/performance/ITestS3AOpenCost.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,12 @@ public void testOpenFileLongerLength() throws Throwable {
194194
byte[] out = new byte[(int) longLen];
195195
intercept(EOFException.class,
196196
() -> in3.readFully(0, out));
197-
in3.seek(longLen - 1);
198-
assertEquals("read past real EOF on " + in3,
199-
-1, in3.read());
200-
in3.close();
201-
return in3.toString();
202-
},
197+
in3.seek(longLen - 1);
198+
assertEquals("read past real EOF on " + in3,
199+
-1, in3.read());
200+
in3.close();
201+
return in3.toString();
202+
},
203203
// two GET calls were made, one for readFully,
204204
// the second on the read() past the EOF
205205
// the operation has got as far as S3

0 commit comments

Comments
 (0)