HADOOP-19431. Fix CheckStyle.

Author: fanshilun

hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java

@@ -119,14 +119,14 @@ protected SimpleCopyListing(Configuration configuration,
     this.randomizeFileListing = randomizeFileListing;
   }
 
-  protected void initSimpleCopyListing(Configuration configuration,
-    Credentials credentials, int numListstatusThreads, int fileStatusLimit,
-    boolean randomizeFileListing) {
-    setConf(configuration);
-    setCredentials(credentials);
-    this.numListstatusThreads = numListstatusThreads;
-    this.fileStatusLimit = Math.max(1, fileStatusLimit);
-    this.randomizeFileListing = randomizeFileListing;
+  protected void initSimpleCopyListing(Configuration pConfiguration,
+      Credentials pCredentials, int pNumListstatusThreads, int pFileStatusLimit,
+      boolean pRandomizeFileListing) {
+    setConf(pConfiguration);
+    setCredentials(pCredentials);
+    this.numListstatusThreads = pNumListstatusThreads;
+    this.fileStatusLimit = Math.max(1, pFileStatusLimit);
+    this.randomizeFileListing = pRandomizeFileListing;
   }
 
   protected SimpleCopyListing(Configuration configuration,

hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java

@@ -409,9 +409,9 @@ private void validateFinalListing(Path pathToListFile, List<Path> srcFiles)
       int idx = 0;
       while (reader.next(currentKey)) {
         reader.getCurrentValue(currentVal);
-        assertEquals(fs.makeQualified(srcFiles.get(idx))
-,             currentVal.getPath(), "srcFiles.size=" + srcFiles.size()
-                + ", idx=" + idx);
+        assertEquals(fs.makeQualified(srcFiles.get(idx)),
+            currentVal.getPath(), "srcFiles.size=" + srcFiles.size() +
+            ", idx=" + idx);
         if (LOG.isDebugEnabled()) {
           LOG.debug("val=" + fs.makeQualified(srcFiles.get(idx)));
         }

hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpOptions.java

@@ -121,12 +121,12 @@ public void testSetNonPositiveBandwidth() {
 
   @Test
   public void testSetZeroBandwidth() {
-    assertThrows(IllegalArgumentException.class, ()->{
+    assertThrows(IllegalArgumentException.class, () -> {
       new DistCpOptions.Builder(
-      Collections.singletonList(new Path("hdfs://localhost:8020/source")),
-      new Path("hdfs://localhost:8020/target/"))
-      .withMapBandwidth(0)
-      .build();
+            Collections.singletonList(new Path("hdfs://localhost:8020/source")),
+            new Path("hdfs://localhost:8020/target/"))
+            .withMapBandwidth(0)
+            .build();
     });
   }
 

hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpSystem.java

@@ -216,8 +216,8 @@ private void compareFiles(FileSystem fs, FileStatus srcStat,
         "File POSIX permission should match");
     assertEquals(srcStat.getOwner(), dstStat.getOwner(),
         "File user ownership should match");
-    assertEquals(
-       srcStat.getGroup(), dstStat.getGroup(), "File group ownership should match");
+    assertEquals(srcStat.getGroup(), dstStat.getGroup(),
+        "File group ownership should match");
     // TODO; check ACL attributes
 
     if (srcStat.isDirectory()) {

hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestExternalCall.java

@@ -88,21 +88,20 @@ public void tearDown() {
   @Test
   public void testCleanup() throws Exception {
 
-      Configuration conf = getConf();
+    Configuration conf = getConf();
 
-      Path stagingDir = JobSubmissionFiles.getStagingDir(new Cluster(conf),
-          conf);
-      stagingDir.getFileSystem(conf).mkdirs(stagingDir);
-      Path soure = createFile("tmp.txt");
-      Path target = createFile("target.txt");
+    Path stagingDir = JobSubmissionFiles.getStagingDir(new Cluster(conf),
+        conf);
+    stagingDir.getFileSystem(conf).mkdirs(stagingDir);
+    Path soure = createFile("tmp.txt");
+    Path target = createFile("target.txt");
 
-      DistCp distcp = new DistCp(conf, null);
-      String[] arg = { soure.toString(), target.toString() };
+    DistCp distcp = new DistCp(conf, null);
+    String[] arg = { soure.toString(), target.toString() };
 
-      distcp.run(arg);
-      assertTrue(fs.exists(target));
+    distcp.run(arg);
+    assertTrue(fs.exists(target));
 
-  
   }
 
   private Path createFile(String fname) throws IOException {

hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java

@@ -944,8 +944,8 @@ private void doTestIgnoreFailures(boolean ignoreFailures) {
       }
       if (ignoreFailures) {
         for (Text value : stubContext.getWriter().values()) {
-          assertTrue(
-             value.toString().startsWith("FAIL:"), value.toString() + " is not skipped");
+          assertTrue(value.toString().startsWith("FAIL:"),
+              value.toString() + " is not skipped");
         }
       }
       assertTrue(ignoreFailures, "There should have been an exception.");
@@ -1332,11 +1332,11 @@ private void testPreserveUserGroupImpl(boolean preserve){
           assertTrue(!preserve || source.getOwner().equals(target.getOwner()));
           assertTrue(!preserve || source.getGroup().equals(target.getGroup()));
           assertTrue(!preserve || source.getPermission().equals(target.getPermission()));
-          assertTrue( preserve || !source.getOwner().equals(target.getOwner()));
-          assertTrue( preserve || !source.getGroup().equals(target.getGroup()));
-          assertTrue( preserve || !source.getPermission().equals(target.getPermission()));
+          assertTrue(preserve || !source.getOwner().equals(target.getOwner()));
+          assertTrue(preserve || !source.getGroup().equals(target.getGroup()));
+          assertTrue(preserve || !source.getPermission().equals(target.getPermission()));
           assertTrue(source.isDirectory() ||
-                  source.getReplication() != target.getReplication());
+              source.getReplication() != target.getReplication());
         }
       }
     }

hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestDeletedDirTracker.java

@@ -206,8 +206,8 @@ private void expectShouldDelete(final Path path, boolean isDir) {
   }
 
   private void expectShouldDelete(CopyListingFileStatus status) {
-    assertTrue(
-       shouldDelete(status), "Expected shouldDelete of " + status.getPath());
+    assertTrue(shouldDelete(status),
+        "Expected shouldDelete of " + status.getPath());
   }
 
   private boolean shouldDelete(final Path path, final boolean isDir) {
@@ -223,9 +223,8 @@ private void expectShouldNotDelete(final Path path, boolean isDir) {
   }
 
   private void expectShouldNotDelete(CopyListingFileStatus status) {
-    assertFalse(
-       shouldDelete(status), "Expected !shouldDelete of " + status.getPath()
-            + " but got true");
+    assertFalse(shouldDelete(status),
+        "Expected !shouldDelete of " + status.getPath() + " but got true");
   }
 
   private CopyListingFileStatus newStatus(final Path path,
@@ -242,13 +241,13 @@ private CopyListingFileStatus fileStatus(final Path path) {
   }
 
   private void expectCached(final Path path) {
-    assertTrue(
-       tracker.isContained(path), "Path " + path + " is not in the cache of " + tracker);
+    assertTrue(tracker.isContained(path),
+        "Path " + path + " is not in the cache of " + tracker);
   }
 
   private void expectNotCached(final Path path) {
-    assertFalse(
-       tracker.isContained(path), "Path " + path + " is in the cache of " + tracker);
+    assertFalse(tracker.isContained(path),
+        "Path " + path + " is in the cache of " + tracker);
   }
 
 }

hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/lib/TestDynamicInputFormat.java

@@ -203,11 +203,14 @@ public void testDynamicInputChunkContext() throws IOException {
         secondInputFormat.getChunkContext(configuration);
     DynamicInputChunkContext fourthContext =
         secondInputFormat.getChunkContext(configuration);
-    assertTrue(firstContext.equals(secondContext), "Chunk contexts from the same DynamicInputFormat " +
+    assertTrue(firstContext.equals(secondContext),
+        "Chunk contexts from the same DynamicInputFormat " +
         "object should be the same.");
-    assertTrue(thirdContext.equals(fourthContext), "Chunk contexts from the same DynamicInputFormat " +
+    assertTrue(thirdContext.equals(fourthContext),
+        "Chunk contexts from the same DynamicInputFormat " +
         "object should be the same.");
-    assertTrue(!firstContext.equals(thirdContext), "Contexts from different DynamicInputFormat " +
+    assertTrue(!firstContext.equals(thirdContext),
+        "Contexts from different DynamicInputFormat " +
         "objects should be different.");
   }
 }