Fix code conflicts.

Author: jojochuang

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery.java

@@ -705,7 +705,7 @@ public void testNotMatchedReplicaID() throws IOException {
       streams.close();
     }
   }
-  
+
   /**
    * DNs report RUR instead of RBW, RWR or FINALIZED. Primary DN expected to
    * throw an exception.

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery2.java

@@ -77,9 +77,9 @@
 import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_HEARTBEAT_RECHECK_INTERVAL_KEY;
 import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_REPLICATION_MIN_KEY;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -141,23 +141,23 @@ public void startUp() throws IOException {
         (Answer<DatanodeRegistration>) invocation ->
             (DatanodeRegistration) invocation.getArguments()[0])
         .when(namenode)
-        .registerDatanode(Mockito.any(DatanodeRegistration.class));
+        .registerDatanode(any(DatanodeRegistration.class));
 
     when(namenode.versionRequest())
         .thenReturn(new NamespaceInfo(1, CLUSTER_ID, POOL_ID, 1L));
 
     when(namenode.sendHeartbeat(
-        Mockito.any(),
-        Mockito.any(),
-        Mockito.anyLong(),
-        Mockito.anyLong(),
+        any(),
+        any(),
+        anyLong(),
+        anyLong(),
         Mockito.anyInt(),
         Mockito.anyInt(),
         Mockito.anyInt(),
-        Mockito.any(),
+        any(),
         Mockito.anyBoolean(),
-        Mockito.any(),
-        Mockito.any()))
+        any(),
+        any()))
         .thenReturn(new HeartbeatResponse(
             new DatanodeCommand[0],
             new NNHAStatusHeartbeat(HAServiceProtocol.HAServiceState.ACTIVE, 1),

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeReconfiguration.java

@@ -40,12 +40,15 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Test to reconfigure some parameters for DataNode without restart
  */
 public class TestDataNodeReconfiguration {
-
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestBlockRecovery.class);
   private static final String DATA_DIR = MiniDFSCluster.getBaseDirectory()
       + "data";
   private final static InetSocketAddress NN_ADDR = new InetSocketAddress(