HADOOP-19415. Fix CheckStyle Issue.

Author: slfan1989

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/impl/TestVectoredReadUtils.java

@@ -688,7 +688,7 @@ private static FileRange retrieve(List<FileRange> input, String key) {
   }
 
   /**
-   * Mock run a vectored read and validate the results with the 
+   * Mock run a vectored read and validate the results with the
    * <ol>
    *   <li> {@code ByteBufferPositionedReadable.readFully()} is invoked once per range.</li>
    *   <li> The buffers are filled with data</li>

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/HadoopTestBase.java

@@ -23,6 +23,8 @@
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import java.util.concurrent.TimeUnit;
+
 import static org.apache.hadoop.test.HadoopTestBase.TEST_DEFAULT_TIMEOUT_VALUE;
 
 /**
@@ -32,7 +34,7 @@
  * Threads are named to the method being executed, for ease of diagnostics
  * in logs and thread dumps.
  */
-@Timeout(TEST_DEFAULT_TIMEOUT_VALUE)
+@Timeout(value = TEST_DEFAULT_TIMEOUT_VALUE, unit = TimeUnit.MILLISECONDS)
 public abstract class HadoopTestBase extends Assertions {
 
   /**
@@ -46,8 +48,34 @@ public abstract class HadoopTestBase extends Assertions {
    * {@link #PROPERTY_TEST_DEFAULT_TIMEOUT}
    * is not set: {@value}.
    */
-  public static final int TEST_DEFAULT_TIMEOUT_VALUE = 100;
-  
+  public static final int TEST_DEFAULT_TIMEOUT_VALUE = 100000;
+
+  /**
+   * The JUnit rule that sets the default timeout for tests.
+   */
+  public int defaultTimeout = retrieveTestTimeout();
+
+  /**
+   * Retrieve the test timeout from the system property
+   * {@link #PROPERTY_TEST_DEFAULT_TIMEOUT}, falling back to
+   * the value in {@link #TEST_DEFAULT_TIMEOUT_VALUE} if the
+   * property is not defined.
+   * @return the recommended timeout for tests
+   */
+  protected int retrieveTestTimeout() {
+    String propval = System.getProperty(PROPERTY_TEST_DEFAULT_TIMEOUT,
+                                         Integer.toString(
+                                           TEST_DEFAULT_TIMEOUT_VALUE));
+    int millis;
+    try {
+      millis = Integer.parseInt(propval);
+    } catch (NumberFormatException e) {
+      //fall back to the default value, as the property cannot be parsed
+      millis = TEST_DEFAULT_TIMEOUT_VALUE;
+    }
+    return millis;
+  }
+
   /**
    * The method name.
    */

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLimitInputStream.java

@@ -52,8 +52,8 @@ public void testRead() throws IOException {
   public void testResetWithoutMark() throws IOException {
     assertThrows(IOException.class, () -> {
       try (LimitInputStream limitInputStream =
-        new LimitInputStream(new RandomInputStream(), 128)) {
-           limitInputStream.reset();
+          new LimitInputStream(new RandomInputStream(), 128)) {
+        limitInputStream.reset();
       }
     });
   }

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMultipleNNPortQOP.java

@@ -73,7 +73,7 @@ public void setup() throws Exception {
     // rpc, it would return client port, in this case, it will be the
     // auxiliary port for data node. Which is not what auxiliary is for.
     // setting service rpc port to avoid this.
-    clusterConf.set(DFS_NAMENODE_SERVICE_RPC_ADDRESS_KEY, "localhost:9020");
+    clusterConf.set(DFS_NAMENODE_SERVICE_RPC_ADDRESS_KEY, "localhost:9021");
     clusterConf.set(
         CommonConfigurationKeys.HADOOP_SECURITY_SASL_PROPS_RESOLVER_CLASS,
         "org.apache.hadoop.security.IngressPortBasedResolver");

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

@@ -109,8 +109,8 @@ public void testBlockFactoryIO(String pBufferType) throws Throwable {
       assertEquals(limit - bufferLen, block.remainingCapacity(),
           "capacity in " + block);
       assertTrue(block.hasCapacity(64), "hasCapacity(64) in " + block);
-      assertTrue(
-         block.hasCapacity(limit - bufferLen), "No capacity in " + block);
+      assertTrue(block.hasCapacity(limit - bufferLen),
+          "No capacity in " + block);
 
       // now start the write
       S3ADataBlocks.BlockUploadData blockUploadData = block.startUpload();

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

@@ -486,9 +486,9 @@ public void testRetryOnThrottle() throws Throwable {
   public void testNoRetryOfBadRequestNonIdempotent() throws Throwable {
     assertThrows(AWSBadRequestException.class, () -> {
       invoker.retry("test", null, false,
-        () -> {
+          () -> {
           throw serviceException(400, "bad request");
-      });
+        });
     });
   }
 
@@ -514,7 +514,7 @@ public void testRetryAWSConnectivity() throws Throwable {
   public void testRetryBadRequestNotIdempotent() throws Throwable {
     assertThrows(AWSBadRequestException.class, () -> {
       invoker.retry("test", null, false,
-        () -> {
+          () -> {
           throw BAD_REQUEST;
         });
     });

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/staging/TestStagingPartitionedFileListing.java

@@ -163,7 +163,7 @@ public void testPartitionsResolution() throws Throwable {
     Path rootFile = new Path(attemptPath, "root.txt");
     touch(attemptFS, rootFile);
     assertThat(listPartitions(attemptFS, attemptPath)).
-       containsAnyOf(oct2017, StagingCommitterConstants.TABLE_ROOT);
+        containsAnyOf(oct2017, StagingCommitterConstants.TABLE_ROOT);
   }
 
   /**

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/TestS3AMultipartUploaderSupport.java

@@ -65,8 +65,8 @@ public void testRoundTrip2() throws Throwable {
     assertEquals(1, result.getPartNumber());
     assertEquals("11223344", result.getEtag());
     assertEquals(len, result.getLen());
-   assertThat(result.getChecksumAlgorithm())
-       .describedAs("Checksum algorithm must not be present").isNull();
+    assertThat(result.getChecksumAlgorithm())
+        .describedAs("Checksum algorithm must not be present").isNull();
     assertThat(result.getChecksum())
         .describedAs("Checksum must not be generated").isNull();
   }

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAzureBlobFileSystemBasics.java

@@ -18,6 +18,7 @@
 package org.apache.hadoop.fs.azurebfs.contract;
 
 import java.io.IOException;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.hadoop.fs.FileSystemContractBaseTest;
 import org.apache.hadoop.fs.FileStatus;
@@ -36,7 +37,7 @@
 /**
  * Basic Contract test for Azure BlobFileSystem.
  */
-@Timeout(TEST_TIMEOUT)
+@Timeout(value = TEST_TIMEOUT, unit = TimeUnit.MILLISECONDS)
 public class ITestAzureBlobFileSystemBasics extends FileSystemContractBaseTest {
   private final ABFSContractTestBinding binding;