HDDS-12505. Use Mockito doReturn() in hadoop-hdds/client

Author: chiacyu

hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/storage/DummyBlockInputStreamWithRetry.java

@@ -18,8 +18,8 @@
 package org.apache.hadoop.hdds.scm.storage;
 
 import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.CONTAINER_NOT_FOUND;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.util.List;
@@ -63,7 +63,7 @@ final class DummyBlockInputStreamWithRetry
           try {
             BlockLocationInfo blockLocationInfo = mock(BlockLocationInfo.class);
             Pipeline mockPipeline = MockPipeline.createPipeline(1);
-            when(blockLocationInfo.getPipeline()).thenReturn(mockPipeline);
+            doReturn(mockPipeline).when(blockLocationInfo.getPipeline());
             return blockLocationInfo;
           } catch (IOException e) {
             throw new RuntimeException(e);

hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/storage/TestBlockInputStream.java

@@ -26,6 +26,8 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
@@ -69,7 +71,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.mockito.stubbing.OngoingStubbing;
 import org.slf4j.event.Level;
 
 /**
@@ -296,18 +297,18 @@ void refreshesPipelineOnReadFailure(IOException ex) throws Exception {
     // GIVEN
     Pipeline pipeline = MockPipeline.createSingleNodePipeline();
     BlockLocationInfo blockLocationInfo = mock(BlockLocationInfo.class);
-    when(blockLocationInfo.getPipeline()).thenReturn(pipeline);
+    doReturn(pipeline).when(blockLocationInfo.getPipeline());
     Pipeline newPipeline = MockPipeline.createSingleNodePipeline();
     BlockLocationInfo newBlockLocationInfo = mock(BlockLocationInfo.class);
 
     testRefreshesPipelineOnReadFailure(ex, blockLocationInfo,
         id -> newBlockLocationInfo);
 
-    when(newBlockLocationInfo.getPipeline()).thenReturn(newPipeline);
+    doReturn(newPipeline).when(newBlockLocationInfo.getPipeline());
     testRefreshesPipelineOnReadFailure(ex, blockLocationInfo,
         id -> blockLocationInfo);
 
-    when(newBlockLocationInfo.getPipeline()).thenReturn(null);
+    doReturn(null).when(newBlockLocationInfo.getPipeline());
     testRefreshesPipelineOnReadFailure(ex, blockLocationInfo,
         id -> newBlockLocationInfo);
   }
@@ -352,14 +353,11 @@ private static Stream<Arguments> exceptionsNotTriggerRefresh() {
   private static ChunkInputStream throwingChunkInputStream(IOException ex,
       int len, boolean succeedOnRetry) throws IOException {
     final ChunkInputStream stream = mock(ChunkInputStream.class);
-    OngoingStubbing<Integer> stubbing =
-        when(stream.read(any(), anyInt(), anyInt()))
-            .thenThrow(ex);
+    doThrow(ex).doReturn(len).when(stream.read(any(), anyInt(), anyInt()));
     if (succeedOnRetry) {
-      stubbing.thenReturn(len);
+      doReturn(len).when(stream).read(any(), anyInt(), anyInt());
     }
-    when(stream.getRemaining())
-        .thenReturn((long) len);
+    doReturn((long) len).when(stream.getRemaining());
     return stream;
   }
 
@@ -415,15 +413,13 @@ public void testRefreshOnReadFailureAfterUnbuffer(IOException ex)
     XceiverClientFactory clientFactory = mock(XceiverClientFactory.class);
     XceiverClientSpi client = mock(XceiverClientSpi.class);
     BlockLocationInfo blockLocationInfo = mock(BlockLocationInfo.class);
-    when(clientFactory.acquireClientForReadData(pipeline))
-        .thenReturn(client);
+    doReturn(client).when(clientFactory.acquireClientForReadData(pipeline));
 
     final int len = 200;
     final ChunkInputStream stream = throwingChunkInputStream(ex, len, true);
 
-    when(refreshFunction.apply(blockID))
-        .thenReturn(blockLocationInfo);
-    when(blockLocationInfo.getPipeline()).thenReturn(newPipeline);
+    doReturn(blockLocationInfo).when(refreshFunction.apply(blockID));
+    doReturn(newPipeline).when(blockLocationInfo.getPipeline());
 
     OzoneClientConfig clientConfig = conf.getObject(OzoneClientConfig.class);
     clientConfig.setChecksumVerify(false);

hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/storage/TestBlockOutputStreamCorrectness.java

@@ -20,8 +20,8 @@
 import static java.util.concurrent.Executors.newFixedThreadPool;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -157,8 +157,7 @@ private BlockOutputStream createBlockOutputStream(BufferPool bufferPool)
     final Pipeline pipeline = MockPipeline.createRatisPipeline();
 
     final XceiverClientManager xcm = mock(XceiverClientManager.class);
-    when(xcm.acquireClient(any()))
-        .thenReturn(new MockXceiverClientSpi(pipeline));
+    doReturn(new MockXceiverClientSpi(pipeline)).when(xcm.acquireClient(any()));
 
     OzoneClientConfig config = new OzoneClientConfig();
     config.setStreamBufferSize(4 * 1024 * 1024);
@@ -186,8 +185,7 @@ private BlockOutputStream createBlockOutputStream(BufferPool bufferPool)
   private ECBlockOutputStream createECBlockOutputStream(OzoneClientConfig clientConfig,
       ECReplicationConfig repConfig, BlockID blockID, Pipeline pipeline) throws IOException {
     final XceiverClientManager xcm = mock(XceiverClientManager.class);
-    when(xcm.acquireClient(any()))
-        .thenReturn(new MockXceiverClientSpi(pipeline));
+    doReturn(new MockXceiverClientSpi(pipeline)).when(xcm.acquireClient(any()));
 
     ContainerClientMetrics clientMetrics = ContainerClientMetrics.acquire();
     StreamBufferArgs streamBufferArgs =

hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/storage/TestChunkInputStream.java

@@ -24,6 +24,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -244,19 +245,16 @@ public void connectsToNewPipeline() throws Exception {
     Pipeline newPipeline = MockPipeline.createSingleNodePipeline();
 
     Token<?> token = mock(Token.class);
-    when(token.encodeToUrlString())
-        .thenReturn("oldToken");
+    doReturn("oldToken").when(token.encodeToUrlString());
     Token<?> newToken = mock(Token.class);
-    when(newToken.encodeToUrlString())
-        .thenReturn("newToken");
+    doReturn("newToken").when(newToken.encodeToUrlString());
 
     AtomicReference<Pipeline> pipelineRef = new AtomicReference<>(pipeline);
     AtomicReference<Token<?>> tokenRef = new AtomicReference<>(token);
 
     XceiverClientFactory clientFactory = mock(XceiverClientFactory.class);
     XceiverClientSpi client = mock(XceiverClientSpi.class);
-    when(clientFactory.acquireClientForReadData(any()))
-        .thenReturn(client);
+    doReturn(client).when(clientFactory.acquireClientForReadData(any()));
     ArgumentCaptor<ContainerCommandRequestProto> requestCaptor =
         ArgumentCaptor.forClass(ContainerCommandRequestProto.class);
     when(client.getPipeline())

hadoop-hdds/client/src/test/java/org/apache/hadoop/ozone/client/io/TestBlockInputStreamFactoryImpl.java

@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -59,7 +60,7 @@ public void testNonECGivesBlockInputStream() throws IOException {
         1024 * 1024 * 10);
     Pipeline pipeline = Mockito.spy(blockInfo.getPipeline());
     blockInfo.setPipeline(pipeline);
-    Mockito.when(pipeline.getReplicaIndex(any(DatanodeDetails.class))).thenReturn(1);
+    doReturn(1).when(pipeline.getReplicaIndex(any(DatanodeDetails.class)));
     OzoneClientConfig clientConfig = conf.getObject(OzoneClientConfig.class);
     clientConfig.setChecksumVerify(true);
     BlockExtendedInputStream stream =