HADOOP-19425. Improve Some Code.

Author: slfan1989

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

@@ -88,8 +88,8 @@ public void testGetAclCallOnHnsConfigAbsence() throws Exception {
     AzureBlobFileSystem fs = ((AzureBlobFileSystem) FileSystem.newInstance(
         getRawConfiguration()));
 
-    AzureBlobFileSystemStore store = Mockito.spy(fs.getAbfsStore());
-    AbfsClient client = Mockito.spy(fs.getAbfsStore().getClient(AbfsServiceType.DFS));
+    AzureBlobFileSystemStore store = spy(fs.getAbfsStore());
+    AbfsClient client = spy(fs.getAbfsStore().getClient(AbfsServiceType.DFS));
     doReturn(client).when(store).getClient(AbfsServiceType.DFS);
     store.getAbfsConfiguration().setIsNamespaceEnabledAccountForTesting(Trilean.UNKNOWN);
 

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

@@ -71,8 +71,7 @@ public void testMkdirExistingDirOverwriteFalse() throws Exception {
     assertMkdirs(fs, path); //checks that mkdirs returns true
     long timeCreated = fs.getFileStatus(path).getModificationTime();
     assertMkdirs(fs, path); //call to existing dir should return success
-    assertEquals(timeCreated,
-        fs.getFileStatus(path).getModificationTime(),
+    assertEquals(timeCreated, fs.getFileStatus(path).getModificationTime(),
         "LMT should not be updated for existing dir");
   }
 

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

@@ -46,8 +46,36 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.anyList;
 import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.atMost;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -365,17 +393,17 @@ public void testNameSpaceConfig() throws Exception {
     AbfsConfiguration abfsConfig = new AbfsConfiguration(configuration, "bogusAccountName");
 
     // Test that the namespace value when config is not set
-    Assertions.assertThat(abfsConfig.getIsNamespaceEnabledAccount())
+    assertThat(abfsConfig.getIsNamespaceEnabledAccount())
         .describedAs("Namespace enabled should be unknown in case config is not set")
         .isEqualTo(Trilean.UNKNOWN);
 
     // In case no namespace config is present, file system init calls getAcl() to determine account type.
-    Assertions.assertThat(abfs.getIsNamespaceEnabled(getTestTracingContext(abfs, false)))
+    assertThat(abfs.getIsNamespaceEnabled(getTestTracingContext(abfs, false)))
         .describedAs("getIsNamespaceEnabled should return account type based on getAcl() call")
         .isEqualTo(abfs.getAbfsClient().getIsNamespaceEnabled());
 
     // In case no namespace config is present, file system init calls getAcl() to determine account type.
-    Assertions.assertThat(abfs.getAbfsStore().getAbfsConfiguration().getIsNamespaceEnabledAccount())
+    assertThat(abfs.getAbfsStore().getAbfsConfiguration().getIsNamespaceEnabledAccount())
         .describedAs("getIsNamespaceEnabled() should return updated account type based on getAcl() call")
         .isNotEqualTo(Trilean.UNKNOWN);
 
@@ -384,17 +412,17 @@ public void testNameSpaceConfig() throws Exception {
     abfsConfig = new AbfsConfiguration(configuration, "bogusAccountName");
 
     // Test that the namespace enabled config is set correctly
-    Assertions.assertThat(abfsConfig.getIsNamespaceEnabledAccount())
+    assertThat(abfsConfig.getIsNamespaceEnabledAccount())
         .describedAs("Namespace enabled should be true in case config is set to true")
         .isEqualTo(Trilean.TRUE);
 
     // In case namespace config is present, same value will be return.
-    Assertions.assertThat(abfs.getIsNamespaceEnabled(getTestTracingContext(abfs, false)))
+    assertThat(abfs.getIsNamespaceEnabled(getTestTracingContext(abfs, false)))
         .describedAs("getIsNamespaceEnabled() should return true when config is set to true")
         .isEqualTo(true);
 
     // In case namespace config is present, same value will be return.
-    Assertions.assertThat(abfs.getAbfsClient().getIsNamespaceEnabled())
+    assertThat(abfs.getAbfsClient().getIsNamespaceEnabled())
         .describedAs("Client's getIsNamespaceEnabled() should return true when config is set to true")
         .isEqualTo(true);
 
@@ -403,17 +431,17 @@ public void testNameSpaceConfig() throws Exception {
     abfsConfig = new AbfsConfiguration(configuration, "bogusAccountName");
 
     // Test that the namespace enabled config is set correctly
-    Assertions.assertThat(abfsConfig.getIsNamespaceEnabledAccount())
+    assertThat(abfsConfig.getIsNamespaceEnabledAccount())
         .describedAs("Namespace enabled should be false in case config is set to false")
         .isEqualTo(Trilean.FALSE);
 
     // In case namespace config is present, same value will be return.
-    Assertions.assertThat(abfs.getIsNamespaceEnabled(getTestTracingContext(abfs, false)))
+    assertThat(abfs.getIsNamespaceEnabled(getTestTracingContext(abfs, false)))
         .describedAs("getIsNamespaceEnabled() should return false when config is set to false")
         .isEqualTo(false);
 
     // In case namespace config is present, same value will be return.
-    Assertions.assertThat(abfs.getAbfsClient().getIsNamespaceEnabled())
+    assertThat(abfs.getAbfsClient().getIsNamespaceEnabled())
         .describedAs("Client's getIsNamespaceEnabled() should return false when config is set to false")
         .isEqualTo(false);
   }
@@ -428,15 +456,15 @@ public void testNameSpaceConfig() throws Exception {
   @Test
   public void testFsInitShouldSetNamespaceConfig() throws Exception {
     // Mock the AzureBlobFileSystem and its dependencies
-    AzureBlobFileSystem mockFileSystem = Mockito.spy((AzureBlobFileSystem)
+    AzureBlobFileSystem mockFileSystem = spy((AzureBlobFileSystem)
         FileSystem.newInstance(getConfigurationWithoutHnsConfig()));
-    AzureBlobFileSystemStore mockStore = Mockito.spy(mockFileSystem.getAbfsStore());
-    AbfsClient abfsClient = Mockito.spy(mockStore.getClient());
-    Mockito.doReturn(abfsClient).when(mockStore).getClient();
-    Mockito.doReturn(abfsClient).when(mockStore).getClient(any());
+    AzureBlobFileSystemStore mockStore = spy(mockFileSystem.getAbfsStore());
+    AbfsClient abfsClient = spy(mockStore.getClient());
+    doReturn(abfsClient).when(mockStore).getClient();
+    doReturn(abfsClient).when(mockStore).getClient(any());
     abfsClient.getIsNamespaceEnabled();
     // Verify that getAclStatus is called once during initialization
-    Mockito.verify(abfsClient, times(0))
+    verify(abfsClient, times(0))
         .getAclStatus(anyString(), any(TracingContext.class));
 
     mockStore.getAbfsConfiguration().setIsNamespaceEnabledAccountForTesting(Trilean.UNKNOWN);
@@ -445,19 +473,19 @@ public void testFsInitShouldSetNamespaceConfig() throws Exception {
     String errorMessage = intercept(InvalidConfigurationValueException.class, () -> {
       abfsClient.getIsNamespaceEnabled();
     }).getMessage();
-    Assertions.assertThat(errorMessage)
+    assertThat(errorMessage)
         .describedAs("Client should throw exception when namespace is unknown")
         .contains("Failed to determine account type");
 
     // In case of unknown namespace, store's getIsNamespaceEnabled should call getAclStatus
     // to determine the namespace status.
     mockStore.getIsNamespaceEnabled(getTestTracingContext(mockFileSystem, false));
-    Mockito.verify(abfsClient, times(1))
+    verify(abfsClient, times(1))
         .getAclStatus(anyString(), any(TracingContext.class));
 
     abfsClient.getIsNamespaceEnabled();
     // Verify that client's getNamespaceEnabled will not call getAclStatus again
-    Mockito.verify(abfsClient, times(1))
+    verify(abfsClient, times(1))
         .getAclStatus(anyString(), any(TracingContext.class));
   }
 

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

@@ -59,6 +59,7 @@
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTracingContext extends AbstractAbfsIntegrationTest {
   private static final String[] CLIENT_CORRELATIONID_LIST = {

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

@@ -39,6 +39,7 @@
 import org.apache.hadoop.mapreduce.lib.output.committer.manifest.impl.ManifestStoreOperations;
 
 import static org.apache.hadoop.fs.azurebfs.commit.AbfsCommitTestHelper.prepareTestConfiguration;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test the Manifest committer stages against ABFS.

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

@@ -41,6 +41,7 @@
 import static org.apache.hadoop.fs.CommonPathCapabilities.ETAGS_PRESERVED_IN_RENAME;
 import static org.apache.hadoop.fs.azurebfs.commit.AbfsCommitTestHelper.prepareTestConfiguration;
 import static org.junit.Assume.assumeTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test {@link AbfsManifestStoreOperations}.

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

@@ -219,9 +219,7 @@ private ManifestSuccessData executeStage(
       d.close();
     }
     dumpOutputTree(dest);
-    assertEquals(0, result, stage
-        + "(" + StringUtils.join(", ", args) + ")"
-        + " failed");
+    assertEquals(0, result, stage+ "(" + StringUtils.join(", ", args) + ")"+ " failed");
     final ManifestSuccessData successFile = validateSuccessFile(getFileSystem(), dest,
         minimumFileCount, "");
     final IOStatistics iostats = successFile.getIOStatistics();

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

@@ -24,9 +24,9 @@
 import java.io.PrintStream;
 import java.net.URI;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -74,7 +74,7 @@ public class ITestAbfsDelegationTokens extends AbstractAbfsIntegrationTest {
   /***
    * Set up the clusters.
    */
-  @BeforeClass
+  @BeforeAll
   public static void setupCluster() throws Exception {
     resetUGI();
     cluster = new KerberizedAbfsCluster();
@@ -86,7 +86,7 @@ public static void setupCluster() throws Exception {
    * Tear down the Cluster.
    */
   @SuppressWarnings("ThrowableNotThrown")
-  @AfterClass
+  @AfterAll
   public static void teardownCluster() throws Exception {
     resetUGI();
     ServiceOperations.stopQuietly(LOG, cluster);
@@ -176,10 +176,9 @@ public void testTokenManagerBinding() throws Throwable {
   @Test
   public void testCanonicalization() throws Throwable {
     String service = getCanonicalServiceName();
-    assertNotNull("No canonical service name from filesystem " + getFileSystem(),
-        service);
-    assertEquals(getFilesystemURI(), new URI(service),
-        "canonical URI and service name mismatch");
+    assertNotNull(
+       service, "No canonical service name from filesystem " + getFileSystem());
+    assertEquals(getFilesystemURI(), new URI(service), "canonical URI and service name mismatch");
   }
 
   protected URI getFilesystemURI() throws IOException {
@@ -199,8 +198,8 @@ public void testDefaultCanonicalization() throws Throwable {
     FileSystem fs = getFileSystem();
     clearTokenServiceName();
 
-    assertEquals("canonicalServiceName is not the default",
-        getDefaultServiceName(fs), getCanonicalServiceName());
+    assertEquals(getDefaultServiceName(fs), getCanonicalServiceName(),
+        "canonicalServiceName is not the default");
   }
 
   protected String getDefaultServiceName(final FileSystem fs) {
@@ -218,8 +217,7 @@ protected void clearTokenServiceName() throws IOException {
   public void testRequestToken() throws Throwable {
     AzureBlobFileSystem fs = getFileSystem();
     Credentials credentials = mkTokens(fs);
-    assertEquals(1, credentials.numberOfTokens(),
-        "Number of collected tokens");
+    assertEquals(1, credentials.numberOfTokens(), "Number of collected tokens");
     verifyCredentialsContainsToken(credentials, fs);
   }
 
@@ -231,12 +229,11 @@ public void testRequestTokenDefault() throws Throwable {
     clearTokenServiceName();
 
     AzureBlobFileSystem fs = getFileSystem();
-    assertEquals("canonicalServiceName is not the default",
-        getDefaultServiceName(fs), fs.getCanonicalServiceName());
+    assertEquals(getDefaultServiceName(fs), fs.getCanonicalServiceName(),
+        "canonicalServiceName is not the default");
 
     Credentials credentials = mkTokens(fs);
-    assertEquals(1,
-        credentials.numberOfTokens(), "Number of collected tokens");
+    assertEquals(1, credentials.numberOfTokens(), "Number of collected tokens");
     verifyCredentialsContainsToken(credentials,
         getDefaultServiceName(fs), getFilesystemURI().toString());
   }
@@ -264,16 +261,13 @@ public StubAbfsTokenIdentifier verifyCredentialsContainsToken(
     Token<? extends TokenIdentifier> token = credentials.getToken(
         new Text(serviceName));
 
-    assertEquals(StubAbfsTokenIdentifier.TOKEN_KIND, token.getKind(),
-        "Token Kind in " + token);
-    assertEquals("Token Service Kind in " + token,
-        tokenService, token.getService().toString());
+    assertEquals(StubAbfsTokenIdentifier.TOKEN_KIND, token.getKind(), "Token Kind in " + token);
+    assertEquals("Token Service Kind in " + token, tokenService, token.getService().toString());
 
     StubAbfsTokenIdentifier abfsId = (StubAbfsTokenIdentifier)
         token.decodeIdentifier();
     LOG.info("Created token {}", abfsId);
-    assertEquals("token URI in " + abfsId,
-        tokenService, abfsId.getUri().toString());
+    assertEquals("token URI in " + abfsId, tokenService, abfsId.getUri().toString());
     return abfsId;
   }
 
@@ -315,8 +309,8 @@ protected String dtutil(final int expected,
         () -> ToolRunner.run(conf, dt, args));
     String s = dtUtilContent.toString();
     LOG.info("\n{}", s);
-    assertEquals(expected, r, "Exit code from command dtutil "
-        + StringUtils.join(" ", args) + " with output " + s);
+    assertEquals(expected, r,
+        "Exit code from command dtutil "+ StringUtils.join(" ", args) + " with output " + s);
     return s;
   }
 
@@ -359,8 +353,7 @@ public void testBaseDTLifecycle() throws Throwable {
     ClassicDelegationTokenManager.useClassicDTManager(conf);
     try (FileSystem fs = FileSystem.newInstance(getFilesystemURI(), conf)) {
       Credentials credentials = mkTokens(fs);
-      assertEquals(1,
-          credentials.numberOfTokens(), "Number of collected tokens");
+      assertEquals(1, credentials.numberOfTokens(), "Number of collected tokens");
       verifyCredentialsContainsToken(credentials,
           fs.getCanonicalServiceName(),
           ClassicDelegationTokenManager.UNSET);

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

@@ -24,13 +24,14 @@
 import java.util.Date;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.hadoop.fs.azurebfs.AbstractAbfsTestWithTimeout;
 
 import static org.apache.hadoop.test.LambdaTestUtils.intercept;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test the refresh logic of workload identity tokens.

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

@@ -31,7 +31,7 @@
 
 import org.assertj.core.api.Assertions;
 import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.mockito.Mockito;
@@ -96,6 +96,7 @@
 import static org.apache.hadoop.fs.azurebfs.constants.ConfigurationKeys.FS_AZURE_CLUSTER_NAME;
 import static org.apache.hadoop.fs.azurebfs.constants.ConfigurationKeys.FS_AZURE_CLUSTER_TYPE;
 import static org.apache.hadoop.fs.azurebfs.constants.TestConfigurationKeys.TEST_CONFIGURATION_FILE_NAME;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test useragent of abfs client.