refactor(test): replace deprecated mockito class Matchers with Argume…

…ntMatchers and its methods during upgrade to spring boot 2.6.x (#6128) While upgrading spring boot 2.6.15, encounter similar errors as given below in multiple module of clouddriver (clouddriver-google, clouddriver-cloudfoundry, clouddriver-ecs) during test compilation: ``` > Task :clouddriver-google:compileTestGroovy FAILED /clouddriver/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/converters/SetStatefulDiskAtomicOperationConverterTest.java:20: error: cannot find symbol import static org.mockito.Matchers.any; ^ symbol: class Matchers location: package org.mockito /clouddriver/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/converters/SetStatefulDiskAtomicOperationConverterTest.java:20: error: static import only from classes and interfaces import static org.mockito.Matchers.any; ^ Note: /clouddriver/clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/validators/SetStatefulDiskDescriptionValidatorTest.java uses or overrides a deprecated API. Note: Recompile with -Xlint:deprecation for details. 2 errors ``` Spring boot [2.6.15](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.15/spring-boot-dependencies-2.6.15.pom) brings mockito 4.0.0 as transitive dependency. The `Matchers` was deprecated in 3.x and now it is removed from mockito [4.0.0](https://github.com/mockito/mockito/releases/tag/v4.0.0). To fix these issues, replacing `Matchers` with `ArgumentMatchers` and its methods.
spinnaker · Jan 2, 2024 · 9eb4ecd · 9eb4ecd
1 parent 8a184f4
commit 9eb4ecd
Show file tree

Hide file tree

Showing 40 changed files with 124 additions and 93 deletions.
diff --git a/...c/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/CacheRepositoryTest.java b/...c/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/cache/CacheRepositoryTest.java
@@ -20,8 +20,8 @@
 import static java.util.Collections.*;
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyCollectionOf;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyCollection;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -129,7 +129,7 @@ void before() {
     when(apps.all(emptyList())).thenReturn(List.of(app, appWithoutInstances));
     when(routes.all(emptyList())).thenReturn(emptyList());
     when(providerCache.filterIdentifiers(any(), any())).thenReturn(emptyList());
-    when(providerCache.getAll(any(), anyCollectionOf(String.class))).thenReturn(emptyList());
+    when(providerCache.getAll(any(), anyCollection())).thenReturn(emptyList());
     when(credentials.getName()).thenReturn("devaccount");
     when(credentials.getClient()).thenReturn(client);
 

diff --git a/...rc/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/OrganizationsTest.java b/...rc/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/OrganizationsTest.java
@@ -1,7 +1,7 @@
 package com.netflix.spinnaker.clouddriver.cloudfoundry.client;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/...test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/ServiceInstancesTest.java b/...test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/ServiceInstancesTest.java
@@ -25,7 +25,15 @@
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import com.netflix.spinnaker.clouddriver.cloudfoundry.client.api.ConfigService;
 import com.netflix.spinnaker.clouddriver.cloudfoundry.client.api.ServiceInstanceService;
@@ -196,7 +204,7 @@ void shouldSuccessfullyCreateService() {
     when(serviceInstanceService.all(any(), any()))
         .thenAnswer(
             invocation -> Calls.response(Response.success(createEmptyOsbServiceInstancePage())));
-    when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class)))
+    when(serviceInstanceService.allUserProvided(any(), anyList()))
         .thenAnswer(
             invocation ->
                 Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage())));
@@ -227,10 +235,10 @@ void shouldSuccessfullyCreateService() {
   @Test
   void shouldThrowExceptionWhenCreationReturnsHttpNotFound() {
 
-    when(serviceInstanceService.all(any(), anyListOf(String.class)))
+    when(serviceInstanceService.all(any(), anyList()))
         .thenAnswer(
             invocation -> Calls.response(Response.success(createEmptyOsbServiceInstancePage())));
-    when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class)))
+    when(serviceInstanceService.allUserProvided(any(), anyList()))
         .thenAnswer(
             invocation ->
                 Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage())));
@@ -265,7 +273,7 @@ void throwExceptionWhenNoServicePlanExistsWithTheNameProvided() {
     servicePlansPageOne.setTotalResults(0);
     servicePlansPageOne.setTotalPages(1);
     servicePlansPageOne.setResources(Collections.emptyList());
-    when(serviceInstanceService.findServicePlans(any(), anyListOf(String.class)))
+    when(serviceInstanceService.findServicePlans(any(), anyList()))
         .thenAnswer(invocation -> Calls.response(Response.success(servicePlansPageOne)));
 
     assertThrows(
@@ -284,9 +292,9 @@ void throwExceptionWhenNoServicePlanExistsWithTheNameProvided() {
 
   @Test
   void shouldUpdateTheServiceIfAlreadyExists() {
-    when(serviceInstanceService.all(any(), anyListOf(String.class)))
+    when(serviceInstanceService.all(any(), anyList()))
         .thenAnswer(invocation -> Calls.response(Response.success(createOsbServiceInstancePage())));
-    when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class)))
+    when(serviceInstanceService.allUserProvided(any(), anyList()))
         .thenAnswer(
             invocation ->
                 Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage())));
@@ -316,9 +324,9 @@ void shouldUpdateTheServiceIfAlreadyExists() {
 
   @Test
   void shouldNotUpdateTheServiceIfAlreadyExists() {
-    when(serviceInstanceService.all(any(), anyListOf(String.class)))
+    when(serviceInstanceService.all(any(), anyList()))
         .thenAnswer(invocation -> Calls.response(Response.success(createOsbServiceInstancePage())));
-    when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class)))
+    when(serviceInstanceService.allUserProvided(any(), anyList()))
         .thenAnswer(
             invocation ->
                 Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage())));
@@ -348,9 +356,9 @@ void shouldNotUpdateTheServiceIfAlreadyExists() {
 
   @Test
   void shouldThrowExceptionIfServiceExistsAndNeedsChangingButUpdateFails() {
-    when(serviceInstanceService.all(any(), anyListOf(String.class)))
+    when(serviceInstanceService.all(any(), anyList()))
         .thenAnswer(invocation -> Calls.response(Response.success(createOsbServiceInstancePage())));
-    when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class)))
+    when(serviceInstanceService.allUserProvided(any(), anyList()))
         .thenAnswer(
             invocation ->
                 Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage())));
@@ -394,9 +402,9 @@ void shouldThrowCloudFoundryApiErrorWhenMoreThanOneServiceInstanceWithTheSameNam
     serviceInstancePage.setResources(
         Arrays.asList(serviceInstanceResource, serviceInstanceResource));
 
-    when(serviceInstanceService.all(any(), anyListOf(String.class)))
+    when(serviceInstanceService.all(any(), anyList()))
         .thenAnswer(invocation -> Calls.response(Response.success(serviceInstancePage)));
-    when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class)))
+    when(serviceInstanceService.allUserProvided(any(), anyList()))
         .thenAnswer(
             invocation ->
                 Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage())));
@@ -420,7 +428,7 @@ void shouldSuccessfullyCreateUserProvidedService() {
     when(serviceInstanceService.all(any(), any()))
         .thenAnswer(
             invocation -> Calls.response(Response.success(createEmptyOsbServiceInstancePage())));
-    when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class)))
+    when(serviceInstanceService.allUserProvided(any(), anyList()))
         .thenAnswer(
             invocation ->
                 Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage())));
@@ -454,7 +462,7 @@ void shouldUpdateUserProvidedServiceInstanceIfAlreadyExists() {
     when(serviceInstanceService.all(any(), any()))
         .thenAnswer(
             invocation -> Calls.response(Response.success(createEmptyOsbServiceInstancePage())));
-    when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class)))
+    when(serviceInstanceService.allUserProvided(any(), anyList()))
         .thenAnswer(
             invocation ->
                 Calls.response(Response.success(createUserProvidedServiceInstancePage())));
@@ -488,7 +496,7 @@ void shouldNotUpdateUserProvidedServiceInstanceIfAlreadyExists() {
     when(serviceInstanceService.all(any(), any()))
         .thenAnswer(
             invocation -> Calls.response(Response.success(createEmptyOsbServiceInstancePage())));
-    when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class)))
+    when(serviceInstanceService.allUserProvided(any(), anyList()))
         .thenAnswer(
             invocation ->
                 Calls.response(Response.success(createUserProvidedServiceInstancePage())));
@@ -1175,7 +1183,7 @@ void getOsbServiceInstanceShouldThrowExceptionWhenServiceNameIsBlank() {
 
   @Test
   void destroyServiceInstanceShouldSucceedWhenNoServiceBindingsExist() {
-    when(serviceInstanceService.all(any(), anyListOf(String.class)))
+    when(serviceInstanceService.all(any(), anyList()))
         .thenAnswer(invocation -> Calls.response(Response.success(createOsbServiceInstancePage())));
     when(serviceInstanceService.getBindingsForServiceInstance("service-instance-guid", null, null))
         .thenAnswer(invocation -> Calls.response(Response.success(new Page<>())));
@@ -1191,7 +1199,7 @@ void destroyServiceInstanceShouldSucceedWhenNoServiceBindingsExist() {
                 .setServiceInstanceName("new-service-instance-name")
                 .setType(DELETE)
                 .setState(IN_PROGRESS));
-    verify(serviceInstanceService, times(1)).all(any(), anyListOf(String.class));
+    verify(serviceInstanceService, times(1)).all(any(), anyList());
     verify(serviceInstanceService, times(1)).destroyServiceInstance(any());
     verify(serviceInstanceService, never()).allUserProvided(any(), any());
   }
@@ -1222,10 +1230,10 @@ void destroyServiceInstanceShouldThrowExceptionWhenDeleteServiceInstanceFails()
 
   @Test
   void destroyServiceInstanceShouldReturnSuccessWhenServiceInstanceDoesNotExist() {
-    when(serviceInstanceService.all(any(), anyListOf(String.class)))
+    when(serviceInstanceService.all(any(), anyList()))
         .thenAnswer(
             invocation -> Calls.response(Response.success(createEmptyOsbServiceInstancePage())));
-    when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class)))
+    when(serviceInstanceService.allUserProvided(any(), anyList()))
         .thenAnswer(
             invocation ->
                 Calls.response(Response.success(createEmptyUserProvidedServiceInstancePage())));
@@ -1244,7 +1252,7 @@ void destroyServiceInstanceShouldReturnSuccessWhenServiceInstanceDoesNotExist()
 
   @Test
   void destroyServiceInstanceShouldFailIfServiceBindingsExists() {
-    when(serviceInstanceService.all(any(), anyListOf(String.class)))
+    when(serviceInstanceService.all(any(), anyList()))
         .thenAnswer(invocation -> Calls.response(Response.success(createOsbServiceInstancePage())));
     when(serviceInstanceService.getBindingsForServiceInstance("service-instance-guid", null, null))
         .thenReturn(
@@ -1262,9 +1270,9 @@ void destroyServiceInstanceShouldFailIfServiceBindingsExists() {
 
   @Test
   void destroyUserProvidedServiceInstanceShouldSucceedWhenNoServiceBindingsExist() {
-    when(serviceInstanceService.all(any(), anyListOf(String.class)))
+    when(serviceInstanceService.all(any(), anyList()))
         .thenAnswer(invocation -> Calls.response(Response.success(new Page<>())));
-    when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class)))
+    when(serviceInstanceService.allUserProvided(any(), anyList()))
         .thenAnswer(
             invocation ->
                 Calls.response(Response.success(createUserProvidedServiceInstancePage())));
@@ -1283,7 +1291,7 @@ void destroyUserProvidedServiceInstanceShouldSucceedWhenNoServiceBindingsExist()
                 .setServiceInstanceName("new-service-instance-name")
                 .setType(DELETE)
                 .setState(IN_PROGRESS));
-    verify(serviceInstanceService, times(1)).all(any(), anyListOf(String.class));
+    verify(serviceInstanceService, times(1)).all(any(), anyList());
     verify(serviceInstanceService, times(1)).allUserProvided(any(), any());
     verify(serviceInstanceService, times(1)).destroyUserProvidedServiceInstance(any());
     verify(serviceInstanceService, times(1))
@@ -1297,9 +1305,9 @@ void destroyUserProvidedServiceInstanceShouldThrowExceptionWhenDeleteServiceInst
     serviceBindingPage.setTotalResults(0);
     serviceBindingPage.setTotalPages(1);
 
-    when(serviceInstanceService.all(any(), anyListOf(String.class)))
+    when(serviceInstanceService.all(any(), anyList()))
         .thenAnswer(invocation -> Calls.response(Response.success(new Page<>())));
-    when(serviceInstanceService.allUserProvided(any(), anyListOf(String.class)))
+    when(serviceInstanceService.allUserProvided(any(), anyList()))
         .thenAnswer(
             invocation ->
                 Calls.response(Response.success(createUserProvidedServiceInstancePage())));

diff --git a/.../src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/ServiceKeysTest.java b/.../src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/ServiceKeysTest.java
@@ -23,10 +23,13 @@
 import static java.util.Collections.singleton;
 import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import com.netflix.spinnaker.clouddriver.cloudfoundry.client.api.ServiceInstanceService;
 import com.netflix.spinnaker.clouddriver.cloudfoundry.client.api.ServiceKeyService;
@@ -70,13 +73,13 @@ class ServiceKeysTest {
           .toJavaMap();
 
   {
-    when(serviceInstanceService.findService(any(), anyListOf(String.class)))
+    when(serviceInstanceService.findService(any(), anyList()))
         .thenReturn(
             Calls.response(
                 Response.success(
                     Page.singleton(new Service().setLabel("service1"), "service-guid"))));
 
-    when(serviceInstanceService.findServicePlans(any(), anyListOf(String.class)))
+    when(serviceInstanceService.findServicePlans(any(), anyList()))
         .thenReturn(
             Calls.response(
                 Response.success(

diff --git a/...undry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/SpacesTest.java b/...undry/src/test/java/com/netflix/spinnaker/clouddriver/cloudfoundry/client/SpacesTest.java
@@ -2,8 +2,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import com.netflix.spinnaker.clouddriver.cloudfoundry.client.api.SpaceService;
 import com.netflix.spinnaker.clouddriver.cloudfoundry.client.model.v2.Page;

diff --git a/...iver/cloudfoundry/deploy/converters/AbstractCloudFoundryAtomicOperationConverterTest.java b/...iver/cloudfoundry/deploy/converters/AbstractCloudFoundryAtomicOperationConverterTest.java
@@ -17,7 +17,7 @@
 package com.netflix.spinnaker.clouddriver.cloudfoundry.deploy.converters;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import com.netflix.spinnaker.clouddriver.cloudfoundry.client.CloudFoundryClient;

diff --git a/...oundry/deploy/converters/AbstractCloudFoundryServerGroupAtomicOperationConverterTest.java b/...oundry/deploy/converters/AbstractCloudFoundryServerGroupAtomicOperationConverterTest.java
@@ -17,7 +17,7 @@
 package com.netflix.spinnaker.clouddriver.cloudfoundry.deploy.converters;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import com.netflix.spinnaker.clouddriver.cloudfoundry.client.CloudFoundryClient;

diff --git a/...ver/cloudfoundry/deploy/converters/AbstractLoadBalancersAtomicOperationConverterTest.java b/...ver/cloudfoundry/deploy/converters/AbstractLoadBalancersAtomicOperationConverterTest.java
@@ -19,7 +19,7 @@
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/...udfoundry/deploy/converters/CreateCloudFoundryServiceKeyAtomicOperationConverterTest.java b/...udfoundry/deploy/converters/CreateCloudFoundryServiceKeyAtomicOperationConverterTest.java
@@ -18,7 +18,7 @@
 
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/...udfoundry/deploy/converters/DeleteCloudFoundryServiceKeyAtomicOperationConverterTest.java b/...udfoundry/deploy/converters/DeleteCloudFoundryServiceKeyAtomicOperationConverterTest.java
@@ -18,7 +18,7 @@
 
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/...dfoundry/deploy/converters/DeployCloudFoundryServerGroupAtomicOperationConverterTest.java b/...dfoundry/deploy/converters/DeployCloudFoundryServerGroupAtomicOperationConverterTest.java
@@ -19,7 +19,7 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/...cloudfoundry/deploy/converters/DeployCloudFoundryServiceAtomicOperationConverterTest.java b/...cloudfoundry/deploy/converters/DeployCloudFoundryServiceAtomicOperationConverterTest.java
@@ -19,7 +19,7 @@
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/...udfoundry/deploy/converters/ScaleCloudFoundryServerGroupAtomicOperationConverterTest.java b/...udfoundry/deploy/converters/ScaleCloudFoundryServerGroupAtomicOperationConverterTest.java
@@ -18,7 +18,7 @@
 
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

diff --git a/...ddriver/cloudfoundry/deploy/ops/AbstractCloudFoundryLoadBalancerMappingOperationTest.java b/...ddriver/cloudfoundry/deploy/ops/AbstractCloudFoundryLoadBalancerMappingOperationTest.java
@@ -18,8 +18,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.Index.atIndex;
-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.when;
 
 import com.netflix.spinnaker.clouddriver.cloudfoundry.client.CloudFoundryApiException;

diff --git a/...ker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServiceAtomicOperationTest.java b/...ker/clouddriver/cloudfoundry/deploy/ops/DeployCloudFoundryServiceAtomicOperationTest.java
@@ -22,8 +22,8 @@
 import static com.netflix.spinnaker.clouddriver.cloudfoundry.client.model.v2.LastOperation.Type.UPDATE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.atIndex;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.when;
 
 import com.netflix.spinnaker.clouddriver.cloudfoundry.client.model.ServiceInstanceResponse;

diff --git a/...er/clouddriver/cloudfoundry/deploy/ops/DestroyCloudFoundryServiceAtomicOperationTest.java b/...er/clouddriver/cloudfoundry/deploy/ops/DestroyCloudFoundryServiceAtomicOperationTest.java
@@ -22,7 +22,7 @@
 import static com.netflix.spinnaker.clouddriver.cloudfoundry.utils.TestUtils.assertThrows;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.atIndex;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import com.netflix.spinnaker.clouddriver.cloudfoundry.client.model.ServiceInstanceResponse;

diff --git a/.../clouddriver/cloudfoundry/deploy/ops/ScaleCloudFoundryServerGroupAtomicOperationTest.java b/.../clouddriver/cloudfoundry/deploy/ops/ScaleCloudFoundryServerGroupAtomicOperationTest.java
@@ -18,7 +18,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.atIndex;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;