HADOOP-19435. Fix CheckStyle.

Author: slfan1989

hadoop-tools/hadoop-fs2img/src/test/java/org/apache/hadoop/hdfs/server/namenode/ITestProvidedImplementation.java

@@ -578,8 +578,8 @@ private DatanodeInfo[] getAndCheckBlockLocations(DFSClient client,
   private void checkUniqueness(DatanodeInfo[] locations) {
     Set<String> set = new HashSet<>();
     for (DatanodeInfo info: locations) {
-      assertFalse(
-         set.contains(info.getDatanodeUuid()), "All locations should be unique");
+      assertFalse(set.contains(info.getDatanodeUuid()),
+          "All locations should be unique");
       set.add(info.getDatanodeUuid());
     }
   }

hadoop-tools/hadoop-fs2img/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSTreeWalk.java

@@ -84,39 +84,35 @@ public void testImportAcl() throws Exception {
    */
   @Test
   public void testACLNotSupported() throws Exception {
-      assertThrows(UnsupportedOperationException.class, () -> {
-          Configuration conf = new Configuration();
-          conf.setBoolean(DFSConfigKeys.DFS_PROVIDED_ACLS_IMPORT_ENABLED, true);
-          FileSystem fs = mock(FileSystem.class);
-          when(fs.getAclStatus(any())).thenThrow(new UnsupportedOperationException());
-          Path root = mock(Path.class);
-          when(root.getFileSystem(conf)).thenReturn(fs);
-          FileStatus rootFileStatus = new FileStatus(0, true, 0, 0, 1, root);
-          when(fs.getFileStatus(root)).thenReturn(rootFileStatus);
-          FSTreeWalk fsTreeWalk = new FSTreeWalk(root, conf);
-          TreeWalk.TreeIterator iter = fsTreeWalk.iterator();
-          fail("Unexpected successful creation of iter: " + iter);
-      });
-  
-
-}
+    assertThrows(UnsupportedOperationException.class, () -> {
+      Configuration conf = new Configuration();
+      conf.setBoolean(DFSConfigKeys.DFS_PROVIDED_ACLS_IMPORT_ENABLED, true);
+      FileSystem fs = mock(FileSystem.class);
+      when(fs.getAclStatus(any())).thenThrow(new UnsupportedOperationException());
+      Path root = mock(Path.class);
+      when(root.getFileSystem(conf)).thenReturn(fs);
+      FileStatus rootFileStatus = new FileStatus(0, true, 0, 0, 1, root);
+      when(fs.getFileStatus(root)).thenReturn(rootFileStatus);
+      FSTreeWalk fsTreeWalk = new FSTreeWalk(root, conf);
+      TreeWalk.TreeIterator iter = fsTreeWalk.iterator();
+      fail("Unexpected successful creation of iter: " + iter);
+    });
+  }
 
   /**
    * Verify creation of INode for ACL enabled TreePath throws an error.
    */
   @Test
   public void testToINodeACLNotSupported() throws Exception {
-      assertThrows(UnsupportedOperationException.class, () -> {
-          BlockResolver blockResolver = new FixedBlockResolver();
-          Path root = new Path("/");
-          FileStatus rootFileStatus = new FileStatus(0, false, 0, 0, 1, root);
-          AclStatus acls = mock(AclStatus.class);
-          TreePath treePath = new TreePath(rootFileStatus, 1, null, null, acls);
-          UGIResolver ugiResolver = mock(UGIResolver.class);
-          when(ugiResolver.getPermissionsProto(null, acls)).thenReturn(1L);
-          treePath.toINode(ugiResolver, blockResolver, null);
-      });
-  
-
-}
+    assertThrows(UnsupportedOperationException.class, () -> {
+      BlockResolver blockResolver = new FixedBlockResolver();
+      Path root = new Path("/");
+      FileStatus rootFileStatus = new FileStatus(0, false, 0, 0, 1, root);
+      AclStatus acls = mock(AclStatus.class);
+      TreePath treePath = new TreePath(rootFileStatus, 1, null, null, acls);
+      UGIResolver ugiResolver = mock(UGIResolver.class);
+      when(ugiResolver.getPermissionsProto(null, acls)).thenReturn(1L);
+      treePath.toINode(ugiResolver, blockResolver, null);
+    });
+  }
 }

hadoop-tools/hadoop-fs2img/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestRandomTreeWalk.java

@@ -40,7 +40,7 @@
 public class TestRandomTreeWalk {
 
   @RegisterExtension
-  public TestName name = new TestName();
+  private TestName name = new TestName();
 
   private Random r = new Random();
 

hadoop-tools/hadoop-fs2img/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSingleUGIResolver.java

@@ -129,35 +129,35 @@ public void testAclResolution() {
 
   @Test
   public void testInvalidUid() {
-      assertThrows(IllegalArgumentException.class, () -> {
-          Configuration conf = ugi.getConf();
-          conf.setInt(SingleUGIResolver.UID, (1 << 24) + 1);
-          ugi.setConf(conf);
-          ugi.resolve(file(TESTUSER, TESTGROUP, new FsPermission((short)0777)));
-      });
+    assertThrows(IllegalArgumentException.class, () -> {
+      Configuration conf = ugi.getConf();
+      conf.setInt(SingleUGIResolver.UID, (1 << 24) + 1);
+      ugi.setConf(conf);
+      ugi.resolve(file(TESTUSER, TESTGROUP, new FsPermission((short) 0777)));
+    });
   }
 
   @Test
   public void testInvalidGid() {
-      assertThrows(IllegalArgumentException.class, () -> {
-          Configuration conf = ugi.getConf();
-          conf.setInt(SingleUGIResolver.GID, (1 << 24) + 1);
-          ugi.setConf(conf);
-          ugi.resolve(file(TESTUSER, TESTGROUP, new FsPermission((short)0777)));
-      });
+    assertThrows(IllegalArgumentException.class, () -> {
+      Configuration conf = ugi.getConf();
+      conf.setInt(SingleUGIResolver.GID, (1 << 24) + 1);
+      ugi.setConf(conf);
+      ugi.resolve(file(TESTUSER, TESTGROUP, new FsPermission((short) 0777)));
+    });
   }
 
   @Test
   public void testDuplicateIds() {
-      assertThrows(IllegalStateException.class, () -> {
-          Configuration conf = new Configuration(false);
-          conf.setInt(SingleUGIResolver.UID, 4344);
-          conf.setInt(SingleUGIResolver.GID, 4344);
-          conf.set(SingleUGIResolver.USER, TESTUSER);
-          conf.set(SingleUGIResolver.GROUP, TESTGROUP);
-          ugi.setConf(conf);
-          ugi.ugiMap();
-      });
+    assertThrows(IllegalStateException.class, () -> {
+      Configuration conf = new Configuration(false);
+      conf.setInt(SingleUGIResolver.UID, 4344);
+      conf.setInt(SingleUGIResolver.GID, 4344);
+      conf.set(SingleUGIResolver.USER, TESTUSER);
+      conf.set(SingleUGIResolver.GROUP, TESTGROUP);
+      ugi.setConf(conf);
+      ugi.ugiMap();
+    });
   }
 
   static void match(long encoded, FsPermission p) {
@@ -184,5 +184,4 @@ static FileStatus file(String user, String group, FsPermission perm) {
           group,                   /* String group,            */
           p);                      /* Path path                */
   }
-
 }