HADOOP-19425. Fix Compile & CheckStyle Issue.

Author: slfan1989

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

@@ -453,7 +453,8 @@ public void testRemoveAclEntriesMinimalDefault() throws Exception {
     fs.removeAclEntries(path, aclSpec);
     AclStatus s = fs.getAclStatus(path);
     AclEntry[] returned = s.getEntries().toArray(new AclEntry[0]);
-    assertArrayEquals(new AclEntry[] {aclEntry(DEFAULT, USER, ALL),aclEntry(DEFAULT, GROUP, READ_EXECUTE),aclEntry(DEFAULT, OTHER, NONE) },
+    assertArrayEquals(new AclEntry[]{aclEntry(DEFAULT, USER, ALL),
+        aclEntry(DEFAULT, GROUP, READ_EXECUTE), aclEntry(DEFAULT, OTHER, NONE)},
         returned);
     assertPermission(fs, (short) RWX_RX);
   }
@@ -580,8 +581,8 @@ public void testRemoveDefaultAclOnlyAccess() throws Exception {
     fs.removeDefaultAcl(path);
     AclStatus s = fs.getAclStatus(path);
     AclEntry[] returned = s.getEntries().toArray(new AclEntry[0]);
-    assertArrayEquals(new AclEntry[] {aclEntry(ACCESS, USER, FOO, ALL),aclEntry(ACCESS, GROUP, READ_EXECUTE) },
-        returned);
+    assertArrayEquals(new AclEntry[]{aclEntry(ACCESS, USER, FOO, ALL),
+        aclEntry(ACCESS, GROUP, READ_EXECUTE)}, returned);
     assertPermission(fs, (short) RWX_RWX);
   }
 
@@ -630,8 +631,8 @@ public void testRemoveDefaultAclStickyBit() throws Exception {
     fs.removeDefaultAcl(path);
     AclStatus s = fs.getAclStatus(path);
     AclEntry[] returned = s.getEntries().toArray(new AclEntry[0]);
-    assertArrayEquals(new AclEntry[] {aclEntry(ACCESS, USER, FOO, ALL),aclEntry(ACCESS, GROUP, READ_EXECUTE) },
-        returned);
+    assertArrayEquals(new AclEntry[]{aclEntry(ACCESS, USER, FOO, ALL),
+        aclEntry(ACCESS, GROUP, READ_EXECUTE)}, returned);
     assertPermission(fs, (short) STICKY_RWX_RWX);
   }
 
@@ -984,8 +985,8 @@ public void testSetPermissionOnlyAccess() throws Exception {
     fs.setPermission(path, FsPermission.createImmutable((short) RW));
     AclStatus s = fs.getAclStatus(path);
     AclEntry[] returned = s.getEntries().toArray(new AclEntry[0]);
-    assertArrayEquals(new AclEntry[] {aclEntry(ACCESS, USER, FOO, READ),aclEntry(ACCESS, GROUP, READ) },
-        returned);
+    assertArrayEquals(new AclEntry[]{aclEntry(ACCESS, USER, FOO, READ),
+        aclEntry(ACCESS, GROUP, READ)}, returned);
     assertPermission(fs, (short) RW);
   }
 
@@ -1165,7 +1166,10 @@ public void testDefaultAclNewDirWithMode() throws Exception {
     fs.mkdirs(dirPath, new FsPermission((short) RWX_R));
     AclStatus s = fs.getAclStatus(dirPath);
     AclEntry[] returned = s.getEntries().toArray(new AclEntry[0]);
-    assertArrayEquals(new AclEntry[] {aclEntry(ACCESS, USER, FOO, ALL),aclEntry(ACCESS, GROUP, READ_EXECUTE),aclEntry(DEFAULT, USER, ALL),aclEntry(DEFAULT, USER, FOO, ALL),aclEntry(DEFAULT, GROUP, READ_EXECUTE),aclEntry(DEFAULT, MASK, ALL),aclEntry(DEFAULT, OTHER, READ_EXECUTE) },
+    assertArrayEquals(new AclEntry[]{aclEntry(ACCESS, USER, FOO, ALL),
+        aclEntry(ACCESS, GROUP, READ_EXECUTE), aclEntry(DEFAULT, USER, ALL),
+        aclEntry(DEFAULT, USER, FOO, ALL), aclEntry(DEFAULT, GROUP, READ_EXECUTE),
+        aclEntry(DEFAULT, MASK, ALL), aclEntry(DEFAULT, OTHER, READ_EXECUTE)},
         returned);
     assertPermission(fs, dirPath, (short) RWX_R);
   }

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

@@ -69,9 +69,8 @@ public void ensureSecureAzureBlobFileSystemIsInitialized() throws Exception {
     rawConfig.set(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY, defaultUri.toString());
 
     try(SecureAzureBlobFileSystem fs = (SecureAzureBlobFileSystem) FileSystem.newInstance(rawConfig)) {
-      assertEquals(fs.getUri(),
-          new URI(FileSystemUriSchemes.ABFS_SECURE_SCHEME, filesystem + "@" +
-          accountName, null, null, null));
+      assertEquals(fs.getUri(), new URI(FileSystemUriSchemes.ABFS_SECURE_SCHEME,
+          filesystem + "@" + accountName, null, null, null));
       assertNotNull(fs.getWorkingDirectory(), "working directory");
     }
   }

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsInputStream.java

@@ -32,6 +32,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 
 import org.apache.hadoop.conf.Configuration;
@@ -881,7 +882,7 @@ public void testReadTypeInTracingContextHeader() throws Exception {
       AbfsInputStream stream = (AbfsInputStream) iStream.getWrappedStream();
       int bytesRead = stream.read(ONE_MB/3, new byte[fileSize], 0,
           fileSize);
-      Assertions.assertThat(fileSize - ONE_MB/3)
+      assertThat(fileSize - ONE_MB/3)
           .describedAs("Read size should match file size")
           .isEqualTo(bytesRead);
     }
@@ -909,7 +910,7 @@ private void readFile(AzureBlobFileSystem fs, Path testPath, int fileSize) throw
     try (FSDataInputStream iStream = fs.open(testPath)) {
       int bytesRead = iStream.read(new byte[fileSize], 0,
           fileSize);
-      Assertions.assertThat(fileSize)
+      assertThat(fileSize)
           .describedAs("Read size should match file size")
           .isEqualTo(bytesRead);
     }
@@ -962,16 +963,16 @@ private void verifyHeaderForReadTypeInTracingContextHeader(TracingContext tracin
     doReturn(EMPTY_STRING).when(mockOp).getTracingContextSuffix();
     tracingContext.constructHeader(mockOp, null, null);
     String[] idList = tracingContext.getHeader().split(COLON, SPLIT_NO_LIMIT);
-    Assertions.assertThat(idList).describedAs("Client Request Id should have all fields").hasSize(
+    assertThat(idList).describedAs("Client Request Id should have all fields").hasSize(
         TracingHeaderVersion.getCurrentVersion().getFieldCount());
     if (expectedReadPos > 0) {
-      Assertions.assertThat(idList[POSITION_INDEX])
+      assertThat(idList[POSITION_INDEX])
           .describedAs("Read Position should match")
           .isEqualTo(Integer.toString(expectedReadPos));
     }
-    Assertions.assertThat(idList[OPERATION_INDEX]).describedAs("Operation Type Should Be Read")
+    assertThat(idList[OPERATION_INDEX]).describedAs("Operation Type Should Be Read")
         .isEqualTo(FSOperationType.READ.toString());
-    Assertions.assertThat(idList[READTYPE_INDEX]).describedAs("Read type in tracing context header should match")
+    assertThat(idList[READTYPE_INDEX]).describedAs("Read type in tracing context header should match")
         .isEqualTo(readType.toString());
   }