HADOOP-19425. Fix CheckStyle.

slfan1989 · slfan1989 · commit e1d919c27c26 · 2025-08-05T09:37:35.000+08:00
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemCheckAccess.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemCheckAccess.java
@@ -330,16 +330,14 @@ private void checkIfConfigIsSet(String configKey){
 
   private void assertAccessible(Path testFilePath, FsAction fsAction)
       throws IOException {
-    assertTrue(
-    
-       isAccessible(testUserFs, testFilePath, fsAction), "Should have been given access  " + fsAction + " on " + testFilePath);
+    assertTrue(isAccessible(testUserFs, testFilePath, fsAction),
+        "Should have been given access  " + fsAction + " on " + testFilePath);
   }
 
   private void assertInaccessible(Path testFilePath, FsAction fsAction)
       throws IOException {
-    assertFalse(
-    
-       isAccessible(testUserFs, testFilePath, fsAction), "Should have been denied access  " + fsAction + " on " + testFilePath);
+    assertFalse(isAccessible(testUserFs, testFilePath, fsAction),
+        "Should have been denied access  " + fsAction + " on " + testFilePath);
   }
 
   private void setExecuteAccessForParentDirs(Path dir) throws IOException {
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemListStatus.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemListStatus.java
@@ -250,7 +250,7 @@ public void testListFileVsListDir2() throws Exception {
     FileStatus[] testFiles = fs.listStatus(testFile0Path);
     assertEquals(1, testFiles.length, "Wrong listing size of file " + testFile0Path);
     FileStatus file0 = testFiles[0];
-    assertEquals(new Path(getTestUrl(),testFolder + "/testFolder2/testFolder3/testFile"),
+    assertEquals(new Path(getTestUrl(), testFolder + "/testFolder2/testFolder3/testFile"),
         file0.getPath(), "Wrong path for " + file0);
     assertIsFileReference(file0);
   }
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemMkDir.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemMkDir.java
@@ -78,8 +78,8 @@ public void testMkdirExistingDirOverwriteFalse() throws Exception {
 
   @Test
   public void createDirWithExistingFilename() throws Exception {
-    assumeFalse(DEFAULT_FS_AZURE_ENABLE_MKDIR_OVERWRITE &&
-        getIsNamespaceEnabled(getFileSystem()),
+    assumeFalse(DEFAULT_FS_AZURE_ENABLE_MKDIR_OVERWRITE
+        && getIsNamespaceEnabled(getFileSystem()),
         "Ignore test until default overwrite is set to false");
     final AzureBlobFileSystem fs = getFileSystem();
     Path path = path("testFilePath");
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemRandomRead.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemRandomRead.java
@@ -217,11 +217,9 @@ public Long call() throws Exception {
               }
       );
       long elapsedTimeMs = timer.elapsedTimeMs();
-      assertTrue(
-      
-             elapsedTimeMs < MAX_ELAPSEDTIMEMS, String.format(
-                      "There should not be any network I/O (elapsedTimeMs=%1$d).",
-                      elapsedTimeMs));
+      assertTrue(elapsedTimeMs < MAX_ELAPSEDTIMEMS, String.format(
+          "There should not be any network I/O (elapsedTimeMs=%1$d).",
+          elapsedTimeMs));
     }
   }
 
@@ -268,11 +266,9 @@ public FSDataInputStream call() throws Exception {
       );
 
       long elapsedTimeMs = timer.elapsedTimeMs();
-      assertTrue(
-      
-             elapsedTimeMs < MAX_ELAPSEDTIMEMS, String.format(
-                      "There should not be any network I/O (elapsedTimeMs=%1$d).",
-                      elapsedTimeMs));
+      assertTrue(elapsedTimeMs < MAX_ELAPSEDTIMEMS, String.format(
+          "There should not be any network I/O (elapsedTimeMs=%1$d).",
+          elapsedTimeMs));
     }
   }
 
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFilesystemAcl.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFilesystemAcl.java
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemInitialization.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemInitialization.java
@@ -51,7 +51,8 @@ public void ensureAzureBlobFileSystemIsInitialized() throws Exception {
 
     String scheme = this.getAuthType() == AuthType.SharedKey ? FileSystemUriSchemes.ABFS_SCHEME
             : FileSystemUriSchemes.ABFS_SECURE_SCHEME;
-    assertEquals(fs.getUri(), new URI(scheme,filesystem + "@" + accountName,null,null,null));
+    assertEquals(fs.getUri(), new URI(scheme,
+        filesystem + "@" + accountName, null, null, null));
     assertNotNull(fs.getWorkingDirectory(), "working directory");
   }
 
@@ -69,8 +70,8 @@ public void ensureSecureAzureBlobFileSystemIsInitialized() throws Exception {
 
     try(SecureAzureBlobFileSystem fs = (SecureAzureBlobFileSystem) FileSystem.newInstance(rawConfig)) {
       assertEquals(fs.getUri(),
-          new URI(FileSystemUriSchemes.ABFS_SECURE_SCHEME,filesystem + "@" +
-          accountName,null,null,null));
+          new URI(FileSystemUriSchemes.ABFS_SECURE_SCHEME, filesystem + "@" +
+          accountName, null, null, null));
       assertNotNull(fs.getWorkingDirectory(), "working directory");
     }
   }
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java
@@ -112,8 +112,7 @@ public void testBase64InvalidFileSystemProperties() throws Exception {
         .getFilesystemProperties(tracingContext);
           assertEquals(properties, fetchedProperties);
       });
-  
-}
+  }
 
   @Test
   public void testBase64InvalidPathProperties() throws Exception {
@@ -129,8 +128,7 @@ public void testBase64InvalidPathProperties() throws Exception {
         .getPathStatus(testPath, tracingContext);
           assertEquals(properties, fetchedProperties);
       });
-  
-}
+  }
 
   @Test
   public void testSetFileSystemProperties() throws Exception {
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestWasbAbfsCompatibility.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestWasbAbfsCompatibility.java
@@ -47,7 +47,6 @@
 import static org.apache.hadoop.fs.contract.ContractTestUtils.assertMkdirs;
 import static org.apache.hadoop.fs.contract.ContractTestUtils.assertPathExists;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * Test compatibility between ABFS client and WASB client.
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/ITestAbfsDelegationTokens.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/ITestAbfsDelegationTokens.java
@@ -24,7 +24,11 @@
 import java.io.PrintStream;
 import java.net.URI;
 
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/TestDTManagerLifecycle.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/extensions/TestDTManagerLifecycle.java
@@ -129,7 +129,7 @@ public void testBindingThroughManager() throws Throwable {
     AbfsDelegationTokenManager manager = new AbfsDelegationTokenManager(conf);
     manager.bind(FSURI, conf);
     StubDelegationTokenManager stub = getTokenManager(manager);
-    assertEquals(ABFS, stub.createServiceText().toString(),"Service in " + manager);
+    assertEquals(ABFS, stub.createServiceText().toString(), "Service in " + manager);
     assertEquals(FSURI, stub.getFsURI(), "Binding URI of " + stub);
 
     Token<DelegationTokenIdentifier> token = manager.getDelegationToken(
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestAbfsClient.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestAbfsClient.java
@@ -33,8 +33,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedClass;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 import org.mockito.Mockito;
 
 import org.apache.hadoop.conf.Configuration;
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestAbfsPositionedRead.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestAbfsPositionedRead.java
@@ -51,8 +51,7 @@ public void testPositionedRead() throws IOException {
     int bytesToRead = 10;
     try (FSDataInputStream inputStream = getFileSystem().open(dest)) {
       assertTrue(inputStream.getWrappedStream() instanceof AbfsInputStream,
-          "unexpected stream type " +
-           inputStream.getWrappedStream().getClass().getSimpleName());
+          "unexpected stream type " + inputStream.getWrappedStream().getClass().getSimpleName());
       byte[] readBuffer = new byte[bytesToRead];
       int readPos = 0;
       Assertions
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsInputStream.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsInputStream.java
@@ -232,9 +232,9 @@ private void verifyOpenWithProvidedStatus(Path path, FileStatus fileStatus,
     builder.withFileStatus(fileStatus);
     FSDataInputStream in = builder.build().get();
     assertEquals(buf.length, in.read(readBuf),
-        String.format("Open with fileStatus [from %s result]: Incorrect number of bytes read",source));
+        String.format("Open with fileStatus [from %s result]: Incorrect number of bytes read", source));
     assertArrayEquals(readBuf, buf,
-        String.format("Open with fileStatus [from %s result]: Incorrect read data",source));
+        String.format("Open with fileStatus [from %s result]: Incorrect read data", source));
   }
 
   private void checkGetPathStatusCalls(Path testFile, FileStatus fileStatus,

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ public void testListFileVsListDir2() throws Exception {`
`250`	`250`	`FileStatus[] testFiles = fs.listStatus(testFile0Path);`
`251`	`251`	`assertEquals(1, testFiles.length, "Wrong listing size of file " + testFile0Path);`
`252`	`252`	`FileStatus file0 = testFiles[0];`
`253`		`- assertEquals(new Path(getTestUrl(),testFolder + "/testFolder2/testFolder3/testFile"),`
	`253`	`+ assertEquals(new Path(getTestUrl(), testFolder + "/testFolder2/testFolder3/testFile"),`
`254`	`254`	`file0.getPath(), "Wrong path for " + file0);`
`255`	`255`	`assertIsFileReference(file0);`
`256`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,11 +217,9 @@ public Long call() throws Exception {`
`217`	`217`	`}`
`218`	`218`	`);`
`219`	`219`	`long elapsedTimeMs = timer.elapsedTimeMs();`
`220`		`- assertTrue(`
`221`		`-`
`222`		`- elapsedTimeMs < MAX_ELAPSEDTIMEMS, String.format(`
`223`		`- "There should not be any network I/O (elapsedTimeMs=%1$d).",`
`224`		`- elapsedTimeMs));`
	`220`	`+ assertTrue(elapsedTimeMs < MAX_ELAPSEDTIMEMS, String.format(`
	`221`	`+ "There should not be any network I/O (elapsedTimeMs=%1$d).",`
	`222`	`+ elapsedTimeMs));`
`225`	`223`	`}`
`226`	`224`	`}`
`227`	`225`
`@@ -268,11 +266,9 @@ public FSDataInputStream call() throws Exception {`
`268`	`266`	`);`
`269`	`267`
`270`	`268`	`long elapsedTimeMs = timer.elapsedTimeMs();`
`271`		`- assertTrue(`
`272`		`-`
`273`		`- elapsedTimeMs < MAX_ELAPSEDTIMEMS, String.format(`
`274`		`- "There should not be any network I/O (elapsedTimeMs=%1$d).",`
`275`		`- elapsedTimeMs));`
	`269`	`+ assertTrue(elapsedTimeMs < MAX_ELAPSEDTIMEMS, String.format(`
	`270`	`+ "There should not be any network I/O (elapsedTimeMs=%1$d).",`
	`271`	`+ elapsedTimeMs));`
`276`	`272`	`}`
`277`	`273`	`}`
`278`	`274`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ public void ensureAzureBlobFileSystemIsInitialized() throws Exception {`
`51`	`51`
`52`	`52`	`String scheme = this.getAuthType() == AuthType.SharedKey ? FileSystemUriSchemes.ABFS_SCHEME`
`53`	`53`	`: FileSystemUriSchemes.ABFS_SECURE_SCHEME;`
`54`		`- assertEquals(fs.getUri(), new URI(scheme,filesystem + "@" + accountName,null,null,null));`
	`54`	`+ assertEquals(fs.getUri(), new URI(scheme,`
	`55`	`+ filesystem + "@" + accountName, null, null, null));`
`55`	`56`	`assertNotNull(fs.getWorkingDirectory(), "working directory");`
`56`	`57`	`}`
`57`	`58`
`@@ -69,8 +70,8 @@ public void ensureSecureAzureBlobFileSystemIsInitialized() throws Exception {`
`69`	`70`
`70`	`71`	`try(SecureAzureBlobFileSystem fs = (SecureAzureBlobFileSystem) FileSystem.newInstance(rawConfig)) {`
`71`	`72`	`assertEquals(fs.getUri(),`
`72`		`- new URI(FileSystemUriSchemes.ABFS_SECURE_SCHEME,filesystem + "@" +`
`73`		`- accountName,null,null,null));`
	`73`	`+ new URI(FileSystemUriSchemes.ABFS_SECURE_SCHEME, filesystem + "@" +`
	`74`	`+ accountName, null, null, null));`
`74`	`75`	`assertNotNull(fs.getWorkingDirectory(), "working directory");`
`75`	`76`	`}`
`76`	`77`	`}`