HADOOP-19415. Fix CheckStyle.

Author: fanshilun

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

@@ -58,8 +58,7 @@ public void testConstructorWithQuota() {
         spaceConsumed(spaceConsumed).spaceQuota(spaceQuota).build();
     assertEquals(length, contentSummary.getLength(), "getLength");
     assertEquals(fileCount, contentSummary.getFileCount(), "getFileCount");
-    assertEquals(directoryCount, 
-        contentSummary.getDirectoryCount(), "getDirectoryCount");
+    assertEquals(directoryCount, contentSummary.getDirectoryCount(), "getDirectoryCount");
     assertEquals(quota, contentSummary.getQuota(), "getQuota");
     assertEquals(spaceConsumed,
         contentSummary.getSpaceConsumed(), "getSpaceConsumed");
@@ -131,11 +130,9 @@ public void testReadFields() throws IOException {
     contentSummary.readFields(in);
     assertEquals(length, contentSummary.getLength(), "getLength");
     assertEquals(fileCount, contentSummary.getFileCount(), "getFileCount");
-    assertEquals(directoryCount, 
-        contentSummary.getDirectoryCount(), "getDirectoryCount");
+    assertEquals(directoryCount, contentSummary.getDirectoryCount(), "getDirectoryCount");
     assertEquals(quota, contentSummary.getQuota(), "getQuota");
-    assertEquals(spaceConsumed, 
-        contentSummary.getSpaceConsumed(), "getSpaceConsumed");
+    assertEquals(spaceConsumed, contentSummary.getSpaceConsumed(), "getSpaceConsumed");
     assertEquals(spaceQuota, contentSummary.getSpaceQuota(), "getSpaceQuota");
   }
 

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

@@ -162,9 +162,9 @@ public void testGetMountCurrentDirectory() throws Exception {
     String mountPath = df.getMount();
     File mountDir = new File(mountPath);
     assertTrue(mountDir.exists(), "Mount dir ["+mountDir.getAbsolutePath()+"] should exist.");
-    assertTrue(mountDir.isDirectory(), 
+    assertTrue(mountDir.isDirectory(),
         "Mount dir ["+mountDir.getAbsolutePath()+"] should be directory.");
-    assertTrue(workingDir.startsWith(mountPath), 
+    assertTrue(workingDir.startsWith(mountPath),
         "Working dir ["+workingDir+"] should start with ["+mountPath+"].");
   }
 }

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

@@ -91,7 +91,7 @@ public void testDU() throws IOException, InterruptedException {
     long duSize = du.getUsed();
     du.close();
 
-    assertTrue(duSize >= writtenSize && writtenSize <= (duSize + slack), 
+    assertTrue(duSize >= writtenSize && writtenSize <= (duSize + slack),
         "Invalid on-disk size");
 
     //test with 0 interval, will not launch thread
@@ -100,15 +100,15 @@ public void testDU() throws IOException, InterruptedException {
     duSize = du.getUsed();
     du.close();
 
-    assertTrue(duSize >= writtenSize && writtenSize <= (duSize + slack), 
+    assertTrue(duSize >= writtenSize && writtenSize <= (duSize + slack),
         "Invalid on-disk size");
 
     //test without launching thread
     du = new DU(file, 10000, 0, -1);
     du.init();
     duSize = du.getUsed();
 
-    assertTrue(duSize >= writtenSize && writtenSize <= (duSize + slack), 
+    assertTrue(duSize >= writtenSize && writtenSize <= (duSize + slack),
         "Invalid on-disk size");
   }
 

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

@@ -79,7 +79,7 @@ public Long answer(InvocationOnMock invocation) {
 
     renewer.addRenewAction(fs);
 
-    assertEquals(1, renewer.getRenewQueueLength(), 
+    assertEquals(1, renewer.getRenewQueueLength(),
         "FileSystem not added to DelegationTokenRenewer");
 
     Thread.sleep(RENEW_CYCLE*2);
@@ -92,7 +92,7 @@ public Long answer(InvocationOnMock invocation) {
     verify(fs, never()).getDelegationToken(null);
     verify(fs, never()).setDelegationToken(any());
 
-    assertEquals(0, renewer.getRenewQueueLength(), 
+    assertEquals(0, renewer.getRenewQueueLength(),
         "FileSystem not removed from DelegationTokenRenewer");
   }
 

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

@@ -60,7 +60,7 @@ public class TestFileSystemStorageStatistics {
       new FileSystem.Statistics("test-scheme");
   private FileSystemStorageStatistics storageStatistics =
       new FileSystemStorageStatistics(FS_STORAGE_STATISTICS_NAME, statistics);
-  
+
   @BeforeEach
   public void setup() {
     statistics.incrementBytesRead(RandomUtils.nextInt(0, 100));

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

@@ -307,8 +307,8 @@ public void testFilterPathCapabilites() throws Exception {
     try (FilterFileSystem flfs = new FilterLocalFileSystem()) {
       flfs.initialize(URI.create("filter:/"), conf);
       Path src = new Path("/src");
-      assertFalse(flfs.hasPathCapability(src, CommonPathCapabilities.FS_MULTIPART_UPLOADER), 
-         "hasPathCapability(FS_MULTIPART_UPLOADER) should have failed for " + flfs);
+      assertFalse(flfs.hasPathCapability(src, CommonPathCapabilities.FS_MULTIPART_UPLOADER),
+          "hasPathCapability(FS_MULTIPART_UPLOADER) should have failed for " + flfs);
     }
   }
 

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

@@ -109,7 +109,7 @@ private void change(int exit, String owner, String group, String...files)
           assertEquals(((owner != null) ? "STUB-"+owner : oldStats[i][j].getOwner()),
               stats[j].getOwner(), "check owner of " + files[i]);
           assertEquals(((group != null) ? "STUB-"+group : oldStats[i][j].getGroup()),
-              stats[j].getGroup(), "check group of " + files[i]);        
+              stats[j].getGroup(), "check group of " + files[i]);
         }
       }
     }
@@ -310,7 +310,8 @@ public void testGetWithInvalidSourcePathShouldNotDisplayNullInConsole()
       results = bytes.toString();
       assertEquals(1, run, "Return code should be 1");
       assertTrue(!results.contains("get: null"), " Null is coming when source path is invalid. ");
-      assertTrue(results.contains("get: `"+args[1]+"': No such file or directory"), " Not displaying the intended message ");
+      assertTrue(results.contains("get: `" + args[1] + "': No such file or directory"), 
+          " Not displaying the intended message ");
     } finally {
       IOUtils.closeStream(out);
       System.setErr(oldErr);

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

@@ -55,10 +55,10 @@ private void checkExpansionIsIdentical(String filePattern) throws IOException {
   private void checkExpansion(String filePattern, String... expectedExpansions)
       throws IOException {
     List<String> actualExpansions = GlobExpander.expand(filePattern);
-    assertEquals(expectedExpansions.length, 
+    assertEquals(expectedExpansions.length,
         actualExpansions.size(), "Different number of expansions");
     for (int i = 0; i < expectedExpansions.length; i++) {
-      assertEquals(expectedExpansions[i], 
+      assertEquals(expectedExpansions[i],
           actualExpansions.get(i), "Expansion of " + filePattern);
     }
   }

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

@@ -260,7 +260,7 @@ public void testListLocatedStatus() throws Exception {
       assertTrue(expectedFileNames.contains(fileName), fileName + " not in expected files list");
       expectedFileNames.remove(fileName);
     }
-    assertEquals(0, expectedFileNames.size(), 
+    assertEquals(0, expectedFileNames.size(),
         "Didn't find all of the expected file names: " + expectedFileNames);
   }
 
@@ -274,7 +274,7 @@ public void testMakeQualifiedPath() throws Exception {
         + harPath.toUri().getPath().toString();
     Path path = new Path(harPathWithUserinfo);
     Path qualifiedPath = path.getFileSystem(conf).makeQualified(path);
-    assertTrue(qualifiedPath.toString().equals(harPathWithUserinfo), 
+    assertTrue(qualifiedPath.toString().equals(harPathWithUserinfo),
         String.format("The qualified path (%s) did not match the expected path (%s).",
         qualifiedPath.toString(), harPathWithUserinfo));
   }

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

@@ -162,17 +162,17 @@ public void testDirectory() throws IOException {
     itor = fs.listFiles(TEST_DIR, true);
     stat = itor.next();
     assertTrue(stat.isFile());
-    assertTrue(filesToFind.remove(stat.getPath()), 
+    assertTrue(filesToFind.remove(stat.getPath()),
         "Path " + stat.getPath() + " unexpected");
 
     stat = itor.next();
     assertTrue(stat.isFile());
-    assertTrue(filesToFind.remove(stat.getPath()), 
+    assertTrue(filesToFind.remove(stat.getPath()),
         "Path " + stat.getPath() + " unexpected");
 
     stat = itor.next();
     assertTrue(stat.isFile());
-    assertTrue(filesToFind.remove(stat.getPath()), 
+    assertTrue(filesToFind.remove(stat.getPath()),
         "Path " + stat.getPath() + " unexpected");
     assertFalse(itor.hasNext());
     assertTrue(filesToFind.isEmpty());