From 3239084aab7d5b5a9cb55bc52042b47a0dc04375 Mon Sep 17 00:00:00 2001 From: Nihal Jain Date: Tue, 15 Oct 2024 22:27:17 +0530 Subject: [PATCH] OMID-260 Align mockito version with Hadoop and HBase --- .../TestAsynchronousPostCommitter.java | 2 +- .../apache/omid/transaction/TestCheckpoint.java | 2 +- .../org/apache/omid/transaction/TestFilters.java | 2 +- .../transaction/TestHBaseTransactionClient.java | 2 +- .../transaction/TestHBaseTransactionManager.java | 8 ++++---- .../apache/omid/transaction/TestShadowCells.java | 12 ++++++------ .../omid/transaction/TestTransactionCleanup.java | 6 +++--- hbase-coprocessor/pom.xml | 6 ------ .../apache/omid/transaction/TestCompaction.java | 2 +- .../omid/transaction/TestSnapshotFilter.java | 2 +- pom.xml | 15 ++++----------- .../org/apache/omid/tso/TestLeaseManager.java | 4 ++-- .../java/org/apache/omid/tso/TestPanicker.java | 6 +++--- .../apache/omid/tso/TestPersistenceProcessor.java | 6 +++--- .../omid/tso/TestPersistenceProcessorHandler.java | 6 +++--- .../org/apache/omid/tso/TestReplyProcessor.java | 4 ++-- .../org/apache/omid/tso/TestRequestProcessor.java | 6 +++--- .../org/apache/omid/tso/TestRetryProcessor.java | 2 +- .../omid/tso/TestTSOChannelHandlerNetty.java | 14 +++++++------- .../org/apache/omid/tso/TestTSOStateManager.java | 2 +- .../org/apache/omid/tso/TestTimestampOracle.java | 6 +++--- .../org/apache/omid/tso/TestWorldTimeOracle.java | 6 +++--- ...rationOfTSOClientServerBasicFunctionality.java | 2 +- 23 files changed, 55 insertions(+), 68 deletions(-) diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestAsynchronousPostCommitter.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestAsynchronousPostCommitter.java index 9a98b844a..4464dd4bd 100644 --- a/hbase-client/src/test/java/org/apache/omid/transaction/TestAsynchronousPostCommitter.java +++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestAsynchronousPostCommitter.java @@ -17,7 +17,7 @@ */ package org.apache.omid.transaction; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestCheckpoint.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestCheckpoint.java index f05fc0a2c..f5db44a89 100644 --- a/hbase-client/src/test/java/org/apache/omid/transaction/TestCheckpoint.java +++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestCheckpoint.java @@ -20,7 +20,7 @@ import static org.apache.omid.transaction.CellUtils.hasCell; import static org.apache.omid.transaction.CellUtils.hasShadowCell; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; import static org.testng.Assert.assertTrue; diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestFilters.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestFilters.java index 07cf02173..94a5ac743 100644 --- a/hbase-client/src/test/java/org/apache/omid/transaction/TestFilters.java +++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestFilters.java @@ -17,7 +17,7 @@ */ package org.apache.omid.transaction; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; import static org.testng.Assert.assertEquals; diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionClient.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionClient.java index ef5a24d8b..243572dfb 100644 --- a/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionClient.java +++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionClient.java @@ -21,7 +21,7 @@ import static org.apache.omid.committable.CommitTable.CommitTimestamp.Location.COMMIT_TABLE; import static org.apache.omid.committable.CommitTable.CommitTimestamp.Location.NOT_PRESENT; import static org.apache.omid.committable.CommitTable.CommitTimestamp.Location.SHADOW_CELL; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.spy; diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionManager.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionManager.java index 86930e9c1..ac7c9516e 100644 --- a/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionManager.java +++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionManager.java @@ -17,8 +17,8 @@ */ package org.apache.omid.transaction; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anySetOf; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anySet; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.timeout; @@ -84,7 +84,7 @@ public void testReadOnlyTransactionsDoNotContactTSOServer(ITestContext context) txTable.put(tx1, put); tm.commit(tx1); - verify(tsoClient, times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySetOf(HBaseCellId.class), anySetOf(HBaseCellId.class)); + verify(tsoClient, times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySet(), anySet()); // Create a read-only tx and verify that commit has not been invoked again in the TSOClient AbstractTransaction readOnlyTx = (AbstractTransaction) tm.begin(); @@ -94,7 +94,7 @@ public void testReadOnlyTransactionsDoNotContactTSOServer(ITestContext context) assertTrue(readOnlyTx.getWriteSet().isEmpty()); tm.commit(readOnlyTx); - verify(tsoClient, times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySetOf(HBaseCellId.class), anySetOf(HBaseCellId.class)); + verify(tsoClient, times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySet(), anySet()); assertEquals(readOnlyTx.getStatus(), Transaction.Status.COMMITTED_RO); } diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java index 5e3f89266..d7019e4b4 100644 --- a/hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java +++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java @@ -19,9 +19,9 @@ import static org.apache.omid.transaction.CellUtils.hasCell; import static org.apache.omid.transaction.CellUtils.hasShadowCell; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; @@ -53,7 +53,7 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.omid.committable.CommitTable; import org.apache.omid.metrics.NullMetricsProvider; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.slf4j.Logger; @@ -378,8 +378,8 @@ public List answer(InvocationOnMock invocation) throws Throwable { postCommitEnd.await(); return (List) invocation.callRealMethod(); } - }).when(snapshotFilter).filterCellsForSnapshot(Matchers.>any(), - any(HBaseTransaction.class), anyInt(), Matchers.>any(), Matchers.>any()); + }).when(snapshotFilter).filterCellsForSnapshot(ArgumentMatchers.>any(), + any(HBaseTransaction.class), anyInt(), ArgumentMatchers.>any(), ArgumentMatchers.>any()); TransactionManager tm = newTransactionManager(context); if (hasShadowCell(row, diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java index 42eb58951..79003907e 100644 --- a/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java +++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java @@ -17,8 +17,8 @@ */ package org.apache.omid.transaction; -import static org.mockito.Matchers.anySetOf; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anySet; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; @@ -78,7 +78,7 @@ public void testTransactionIsCleanedUpAfterBeingAborted(ITestContext context) th .when(mockedTSOClient).getNewStartTimestamp(); doReturn(abortingFF) - .when(mockedTSOClient).commit(eq(START_TS), anySetOf(HBaseCellId.class), anySetOf(HBaseCellId.class)); + .when(mockedTSOClient).commit(eq(START_TS), anySet(), anySet()); try (TransactionManager tm = newTransactionManager(context, mockedTSOClient); TTable txTable = new TTable(connection, TEST_TABLE)) { diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml index 6f397c36d..9f6285a2a 100644 --- a/hbase-coprocessor/pom.xml +++ b/hbase-coprocessor/pom.xml @@ -137,12 +137,6 @@ mockito-core test - - org.hamcrest - hamcrest-all - jar - test - org.apache.hbase hbase-testing-util diff --git a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java index ca2dfae38..0ca1a1327 100644 --- a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java +++ b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java @@ -17,7 +17,7 @@ */ package org.apache.omid.transaction; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; diff --git a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestSnapshotFilter.java b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestSnapshotFilter.java index c07679a31..59cebff25 100644 --- a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestSnapshotFilter.java +++ b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestSnapshotFilter.java @@ -17,7 +17,7 @@ */ package org.apache.omid.transaction; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/pom.xml b/pom.xml index 58c4fd8f7..99607f023 100644 --- a/pom.xml +++ b/pom.xml @@ -166,11 +166,10 @@ 2.5.0 0.6.1 4.13.2 - 2.28.2 + 4.11.0 3.2.0 3.0.1 1.82 - 1.3 32.1.3-jre 5.6.0 @@ -1266,16 +1265,10 @@ org.mockito - mockito-core + mockito-bom ${mockito.version} - test - - - - org.hamcrest - hamcrest-all - ${hamcrest.version} - test + pom + import diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java b/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java index 77acfb16a..798bc32b6 100644 --- a/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java +++ b/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java @@ -18,8 +18,8 @@ package org.apache.omid.tso; import static org.apache.omid.tso.client.TSOClient.DEFAULT_ZK_CLUSTER; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java b/tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java index e1625a78f..6659b0a1e 100644 --- a/tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java +++ b/tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java @@ -35,9 +35,9 @@ import java.io.IOException; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java index e98336e95..50b217f9d 100644 --- a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java +++ b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java @@ -37,9 +37,9 @@ import java.io.IOException; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java index 3f77b42b8..7cef4795a 100644 --- a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java +++ b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java @@ -34,9 +34,9 @@ import java.io.IOException; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java b/tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java index d1c5adea1..0bdf37039 100644 --- a/tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java +++ b/tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java @@ -35,8 +35,8 @@ import com.lmax.disruptor.BlockingWaitStrategy; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestRequestProcessor.java b/tso-server/src/test/java/org/apache/omid/tso/TestRequestProcessor.java index f5836dd57..77fd5d881 100644 --- a/tso-server/src/test/java/org/apache/omid/tso/TestRequestProcessor.java +++ b/tso-server/src/test/java/org/apache/omid/tso/TestRequestProcessor.java @@ -35,9 +35,9 @@ import java.util.Collections; import java.util.List; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.timeout; diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestRetryProcessor.java b/tso-server/src/test/java/org/apache/omid/tso/TestRetryProcessor.java index a5fdba82b..84421d75a 100644 --- a/tso-server/src/test/java/org/apache/omid/tso/TestRetryProcessor.java +++ b/tso-server/src/test/java/org/apache/omid/tso/TestRetryProcessor.java @@ -35,7 +35,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import static org.testng.Assert.assertEquals; diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestTSOChannelHandlerNetty.java b/tso-server/src/test/java/org/apache/omid/tso/TestTSOChannelHandlerNetty.java index 269594f0f..d71bd85a1 100644 --- a/tso-server/src/test/java/org/apache/omid/tso/TestTSOChannelHandlerNetty.java +++ b/tso-server/src/test/java/org/apache/omid/tso/TestTSOChannelHandlerNetty.java @@ -55,11 +55,11 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyCollectionOf; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyCollection; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; @@ -283,7 +283,7 @@ private void testWritingTimestampRequest(Channel channel) throws InterruptedExce channel.writeAndFlush(tsBuilder.build()).await(); verify(requestProcessor, timeout(100).times(1)).timestampRequest(any(), any(MonitoringContext.class)); verify(requestProcessor, timeout(100).times(0)) - .commitRequest(anyLong(), anyCollectionOf(Long.class), anyCollectionOf(Long.class), anyBoolean(), any(), any(MonitoringContext.class)); + .commitRequest(anyLong(), anyCollection(), anyCollection(), anyBoolean(), any(), any(MonitoringContext.class)); } private void testWritingCommitRequest(Channel channel) throws InterruptedException { @@ -300,7 +300,7 @@ private void testWritingCommitRequest(Channel channel) throws InterruptedExcepti channel.writeAndFlush(commitBuilder.build()).await(); verify(requestProcessor, timeout(100).times(0)).timestampRequest(any(), any(MonitoringContext.class)); verify(requestProcessor, timeout(100).times(1)) - .commitRequest(eq(666L), anyCollectionOf(Long.class), anyCollectionOf(Long.class), eq(false), any(), any(MonitoringContext.class)); + .commitRequest(eq(666L), anyCollection(), anyCollection(), eq(false), any(), any(MonitoringContext.class)); } private void testWritingFenceRequest(Channel channel) throws InterruptedException { diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java b/tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java index 9d87e793f..05cf3a29c 100644 --- a/tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java +++ b/tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java @@ -24,7 +24,7 @@ import java.io.IOException; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.timeout; diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestTimestampOracle.java b/tso-server/src/test/java/org/apache/omid/tso/TestTimestampOracle.java index b7c7232f0..b317e8d26 100644 --- a/tso-server/src/test/java/org/apache/omid/tso/TestTimestampOracle.java +++ b/tso-server/src/test/java/org/apache/omid/tso/TestTimestampOracle.java @@ -32,9 +32,9 @@ import java.util.concurrent.CountDownLatch; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestWorldTimeOracle.java b/tso-server/src/test/java/org/apache/omid/tso/TestWorldTimeOracle.java index dd4e2be96..2f29137cc 100644 --- a/tso-server/src/test/java/org/apache/omid/tso/TestWorldTimeOracle.java +++ b/tso-server/src/test/java/org/apache/omid/tso/TestWorldTimeOracle.java @@ -31,9 +31,9 @@ import java.util.concurrent.CountDownLatch; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; diff --git a/tso-server/src/test/java/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.java b/tso-server/src/test/java/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.java index b581b6f22..b1f9ff532 100644 --- a/tso-server/src/test/java/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.java +++ b/tso-server/src/test/java/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.java @@ -42,7 +42,7 @@ import java.util.Set; import java.util.concurrent.ExecutionException; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse;