Merge branch 'main' into move-to-a-common-configuration-for-health

Author: wind57

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesDisabled.java renamed to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesDisabledTests.java

@@ -30,7 +30,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = { "spring.profiles.include=kubernetes,kubernetesdisabled" },
 		classes = { KubernetesConfigServerApplication.class, MockConfig.class })
-class ConfigServerAutoConfigurationKubernetesDisabled {
+class ConfigServerAutoConfigurationKubernetesDisabledTests {
 
 	@Autowired
 	private ConfigurableApplicationContext context;

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabled.java renamed to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabledTests.java

@@ -31,7 +31,7 @@
 		classes = { KubernetesConfigServerApplication.class },
 		properties = { "spring.main.cloud-platform=KUBERNETES", "spring.profiles.include=kubernetes",
 				"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.enableApi=false" })
-class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabled {
+class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabledTests {
 
 	@Autowired
 	private ConfigurableApplicationContext context;

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabled.java renamed to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabledTests.java

@@ -30,7 +30,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		classes = { KubernetesConfigServerApplication.class }, properties = { "spring.main.cloud-platform=KUBERNETES",
 				"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.config.enabled=false" })
-class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabled {
+class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabledTests {
 
 	@Autowired
 	private ConfigurableApplicationContext context;

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabled.java renamed to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabledTests.java

@@ -30,7 +30,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		classes = { KubernetesConfigServerApplication.class }, properties = { "spring.main.cloud-platform=KUBERNETES",
 				"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.client.namespace=default" })
-class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabled {
+class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabledTests {
 
 	@Autowired
 	private ConfigurableApplicationContext context;

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabled.java renamed to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabledTests.java

@@ -31,7 +31,7 @@
 		classes = { KubernetesConfigServerApplication.class },
 		properties = { "spring.profiles.include=kubernetes", "spring.main.cloud-platform=KUBERNETES",
 				"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.enableApi=true" })
-class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabled {
+class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabledTests {
 
 	@Autowired
 	private ConfigurableApplicationContext context;

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncluded.java renamed to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedTests.java

@@ -30,7 +30,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		classes = { KubernetesConfigServerApplication.class }, properties = { "spring.main.cloud-platform=KUBERNETES",
 				"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.client.namespace=default" })
-class ConfigServerAutoConfigurationKubernetesEnabledProfileIncluded {
+class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedTests {
 
 	@Autowired
 	private ConfigurableApplicationContext context;

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesProfileMissing.java renamed to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesProfileMissingTests.java

@@ -30,7 +30,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		classes = { KubernetesConfigServerApplication.class, MockConfig.class },
 		properties = { "spring.profiles.include=kubernetes,kubernetesdisabled" })
-class ConfigServerAutoConfigurationKubernetesProfileMissing {
+class ConfigServerAutoConfigurationKubernetesProfileMissingTests {
 
 	@Autowired
 	private ConfigurableApplicationContext context;

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/BootstrapConfigServerIntegrationTest.java renamed to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/BootstrapConfigServerIntegrationTests.java

@@ -27,6 +27,6 @@
 				"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.secrets.enableApi=true",
 				"spring.cloud.bootstrap.enabled=true" },
 		classes = { KubernetesConfigServerApplication.class })
-class BootstrapConfigServerIntegrationTest extends ConfigServerIntegrationTest {
+class BootstrapConfigServerIntegrationTests extends ConfigServerIntegration {
 
 }

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigDataConfigServerIntegrationTest.java renamed to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigDataConfigServerIntegrationTests.java

@@ -36,7 +36,7 @@
 		properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.namespace=default",
 				"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.secrets.enableApi=true" },
 		classes = { KubernetesConfigServerApplication.class, TestBootstrapConfig.class })
-class ConfigDataConfigServerIntegrationTest extends ConfigServerIntegrationTest {
+class ConfigDataConfigServerIntegrationTests extends ConfigServerIntegration {
 
 	private MockedStatic<KubernetesClientUtils> clientUtilsMock;
 

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigServerIntegrationTest.java renamed to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigServerIntegration.java

@@ -41,7 +41,7 @@
 /**
  * @author Ryan Baxter
  */
-abstract class ConfigServerIntegrationTest {
+abstract class ConfigServerIntegration {
 
 	@Autowired
 	private TestRestTemplate testRestTemplate;