fix

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/CompositeKubernetesIntegrationTests.java

@@ -23,7 +23,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.cloud.config.environment.Environment;
 import org.springframework.cloud.config.environment.PropertySource;
@@ -33,6 +32,7 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.web.client.RestTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -92,7 +92,7 @@ class KubernetesSecretsEnabledCompositeConfigServerTest {
 		@LocalServerPort
 		private int port;
 
-		@SpyBean
+		@MockitoSpyBean
 		private NativeEnvironmentRepository nativeEnvironmentRepository;
 
 		@Test
@@ -132,7 +132,7 @@ class KubernetesConfigMapDisabledCompositeConfigServerTest {
 		@LocalServerPort
 		private int port;
 
-		@SpyBean
+		@MockitoSpyBean
 		private NativeEnvironmentRepository nativeEnvironmentRepository;
 
 		@Test
@@ -170,7 +170,7 @@ class KubernetesSecretsDisabledCompositeConfigServerTest {
 		@LocalServerPort
 		private int port;
 
-		@SpyBean
+		@MockitoSpyBean
 		private NativeEnvironmentRepository nativeEnvironmentRepository;
 
 		@Test
@@ -209,7 +209,7 @@ class NativeAndKubernetesConfigServerTest {
 		@LocalServerPort
 		private int port;
 
-		@SpyBean
+		@MockitoSpyBean
 		private NativeEnvironmentRepository nativeEnvironmentRepository;
 
 		@Test

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/BoostrapConfigRetryEnabledTests.java

@@ -22,9 +22,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.cloud.kubernetes.fabric8.config.Fabric8ConfigMapPropertySourceLocator;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
 /**
  * @author Isik Erhan
@@ -42,7 +42,7 @@ static void setup() {
 		setup(mockClient, mockServer);
 	}
 
-	@SpyBean
+	@MockitoSpyBean
 	Fabric8ConfigMapPropertySourceLocator propertySourceLocator;
 
 	@BeforeEach

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigDataConfigRetryEnabledTests.java

@@ -26,10 +26,10 @@
 import org.mockito.internal.util.MockUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.config.ConfigDataRetryableConfigMapPropertySourceLocator;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import static org.mockito.Mockito.spy;
 
@@ -45,7 +45,7 @@ class ConfigDataConfigRetryEnabledTests extends ConfigRetryEnabled {
 
 	private static KubernetesClient mockClient;
 
-	@MockBean
+	@MockitoBean
 	private KubernetesNamespaceProvider namespaceProvider;
 
 	@BeforeAll

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/fail_fast_enabled_retry_disabled/ConfigDataConfigFailFastEnabledButRetryDisabledTests.java

@@ -24,7 +24,6 @@
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import org.junit.jupiter.api.BeforeAll;
 
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
 import org.springframework.cloud.kubernetes.commons.config.RetryProperties;
@@ -33,6 +32,7 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 /**
  * we call Fabric8ConfigMapPropertySourceLocator::locate directly, thus no need for
@@ -53,7 +53,7 @@ class ConfigDataConfigFailFastEnabledButRetryDisabledTests extends ConfigFailFas
 
 	private static KubernetesClient mockClient;
 
-	@MockBean
+	@MockitoBean
 	private KubernetesNamespaceProvider kubernetesNamespaceProvider;
 
 	@BeforeAll
@@ -66,7 +66,7 @@ static class LocalConfig {
 
 		/**
 		 * we need this config because ConfigMapConfigProperties is now a record, so we
-		 * can't use @SpyBean on it. We also read the property of fail-fast from the
+		 * can't use @MockitoSpyBean on it. We also read the property of fail-fast from the
 		 * Environment, that in turn is set in the @SpringBootTest properties.
 		 */
 		@Bean

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/fail_fast_enabled_retry_disabled/ConfigFailFastEnabledButRetryDisabled.java

@@ -23,11 +23,11 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.cloud.kubernetes.fabric8.config.Fabric8ConfigMapPropertySourceLocator;
 import org.springframework.cloud.kubernetes.fabric8.config.TestApplication;
 import org.springframework.context.ApplicationContext;
 import org.springframework.mock.env.MockEnvironment;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -69,7 +69,7 @@ static void setup(KubernetesClient mockClient, KubernetesMockServer mockServer)
 		System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true");
 	}
 
-	@SpyBean
+	@MockitoSpyBean
 	private Fabric8ConfigMapPropertySourceLocator propertySourceLocator;
 
 	@Autowired

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/BootstrapSecretsRetryEnabledTests.java

@@ -22,9 +22,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.cloud.kubernetes.fabric8.config.Fabric8SecretsPropertySourceLocator;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
 @TestPropertySource(properties = "spring.cloud.bootstrap.enabled=true")
 @EnableKubernetesMockClient
@@ -39,7 +39,7 @@ static void setup() {
 		setup(mockClient, mockServer);
 	}
 
-	@SpyBean
+	@MockitoSpyBean
 	private Fabric8SecretsPropertySourceLocator propertySourceLocator;
 
 	@BeforeEach

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_disabled/BootstrapSecretsFailFastDisabledTests.java

@@ -22,9 +22,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.cloud.kubernetes.fabric8.config.Fabric8SecretsPropertySourceLocator;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
 @TestPropertySource(properties = { "spring.cloud.bootstrap.enabled=true" })
 @EnableKubernetesMockClient
@@ -39,7 +39,7 @@ static void setup() {
 		setup(mockClient, mockServer);
 	}
 
-	@SpyBean
+	@MockitoSpyBean
 	private Fabric8SecretsPropertySourceLocator propertySourceLocator;
 
 	@BeforeEach

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_enabled_retry_disabled/BootstrapSecretsFailFastEnabledButRetryDisabledTests.java

@@ -22,9 +22,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.cloud.kubernetes.fabric8.config.Fabric8SecretsPropertySourceLocator;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
 /**
  * @author Isik Erhan
@@ -42,7 +42,7 @@ static void setup() {
 		setup(mockClient, mockServer);
 	}
 
-	@SpyBean
+	@MockitoSpyBean
 	private Fabric8SecretsPropertySourceLocator propertySourceLocator;
 
 	@BeforeEach

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_retry_disabled_config_enabled/BootstrapSecretsRetryDisabledButConfigRetryEnabledTests.java

@@ -22,10 +22,10 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 
-import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.cloud.kubernetes.fabric8.config.Fabric8SecretsPropertySourceLocator;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -45,7 +45,7 @@ static void setup() {
 		setup(mockClient, mockServer);
 	}
 
-	@SpyBean
+	@MockitoSpyBean
 	private Fabric8SecretsPropertySourceLocator propertySourceLocator;
 
 	@BeforeEach