Merge branch '3.1.x'

spring-cloud · Sep 6, 2024 · b4ffce1 · b4ffce1
2 parents 4ff8adf + 3149205
commit b4ffce1
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 18 deletions.
diff --git a/...rAutoConfigurationKubernetesDisabled.java → ...ConfigurationKubernetesDisabledTests.java b/...rAutoConfigurationKubernetesDisabled.java → ...ConfigurationKubernetesDisabledTests.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;

diff --git a/...bledProfileIncludedConfigApiDisabled.java → ...rofileIncludedConfigApiDisabledTests.java b/...bledProfileIncludedConfigApiDisabled.java → ...rofileIncludedConfigApiDisabledTests.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;

diff --git a/...bledProfileIncludedConfigMapDisabled.java → ...rofileIncludedConfigMapDisabledTests.java b/...bledProfileIncludedConfigMapDisabled.java → ...rofileIncludedConfigMapDisabledTests.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;

diff --git a/...ledProfileIncludedSecretsApiDisabled.java → ...ofileIncludedSecretsApiDisabledTests.java b/...ledProfileIncludedSecretsApiDisabled.java → ...ofileIncludedSecretsApiDisabledTests.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;

diff --git a/...bledProfileIncludedSecretsApiEnabled.java → ...rofileIncludedSecretsApiEnabledTests.java b/...bledProfileIncludedSecretsApiEnabled.java → ...rofileIncludedSecretsApiEnabledTests.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;

diff --git a/...tionKubernetesEnabledProfileIncluded.java → ...ubernetesEnabledProfileIncludedTests.java b/...tionKubernetesEnabledProfileIncluded.java → ...ubernetesEnabledProfileIncludedTests.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;

diff --git a/...onfigurationKubernetesProfileMissing.java → ...urationKubernetesProfileMissingTests.java b/...onfigurationKubernetesProfileMissing.java → ...urationKubernetesProfileMissingTests.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;

diff --git a/...BootstrapConfigServerIntegrationTest.java → ...ootstrapConfigServerIntegrationTests.java b/...BootstrapConfigServerIntegrationTest.java → ...ootstrapConfigServerIntegrationTests.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 {
 
 }
diff --git a/...onfigDataConfigServerIntegrationTest.java → ...nfigDataConfigServerIntegrationTests.java b/...onfigDataConfigServerIntegrationTest.java → ...nfigDataConfigServerIntegrationTests.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;
 

diff --git a/...erver/it/ConfigServerIntegrationTest.java → ...figserver/it/ConfigServerIntegration.java b/...erver/it/ConfigServerIntegrationTest.java → ...figserver/it/ConfigServerIntegration.java
@@ -41,7 +41,7 @@
 /**
  * @author Ryan Baxter
  */
-abstract class ConfigServerIntegrationTest {
+abstract class ConfigServerIntegration {
 
 	@Autowired
 	private TestRestTemplate testRestTemplate;

diff --git a/...eryServerIntegrationAppsEndpointTest.java → ...ryServerIntegrationAppsEndpointTests.java b/...eryServerIntegrationAppsEndpointTest.java → ...ryServerIntegrationAppsEndpointTests.java
@@ -52,13 +52,13 @@
  * @author wind57
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		classes = DiscoveryServerIntegrationAppsEndpointTest.TestConfig.class,
+		classes = DiscoveryServerIntegrationAppsEndpointTests.TestConfig.class,
 		properties = { "management.health.livenessstate.enabled=true",
 				/* disable kubernetes from liveness and readiness */
 				"management.endpoint.health.group.liveness.include=livenessState",
 				"management.health.readinessstate.enabled=true",
 				"management.endpoint.health.group.readiness.include=readinessState" })
-class DiscoveryServerIntegrationAppsEndpointTest {
+class DiscoveryServerIntegrationAppsEndpointTests {
 
 	private static final String NAMESPACE = "namespace";
 

diff --git a/...erverIntegrationAppsNameEndpointTest.java → ...rverIntegrationAppsNameEndpointTests.java b/...erverIntegrationAppsNameEndpointTest.java → ...rverIntegrationAppsNameEndpointTests.java
@@ -52,13 +52,13 @@
  * @author wind57
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		classes = DiscoveryServerIntegrationAppsNameEndpointTest.TestConfig.class,
+		classes = DiscoveryServerIntegrationAppsNameEndpointTests.TestConfig.class,
 		properties = { "management.health.livenessstate.enabled=true",
 				/* disable kubernetes from liveness and readiness */
 				"management.endpoint.health.group.liveness.include=livenessState",
 				"management.health.readinessstate.enabled=true",
 				"management.endpoint.health.group.readiness.include=readinessState" })
-class DiscoveryServerIntegrationAppsNameEndpointTest {
+class DiscoveryServerIntegrationAppsNameEndpointTests {
 
 	private static final String NAMESPACE = "namespace";
 

diff --git a/...erverIntegrationInstanceEndpointTest.java → ...rverIntegrationInstanceEndpointTests.java b/...erverIntegrationInstanceEndpointTest.java → ...rverIntegrationInstanceEndpointTests.java
@@ -52,13 +52,13 @@
  * @author wind57
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-		classes = DiscoveryServerIntegrationInstanceEndpointTest.TestConfig.class,
+		classes = DiscoveryServerIntegrationInstanceEndpointTests.TestConfig.class,
 		properties = { "management.health.livenessstate.enabled=true",
 				/* disable kubernetes from liveness and readiness */
 				"management.endpoint.health.group.liveness.include=livenessState",
 				"management.health.readinessstate.enabled=true",
 				"management.endpoint.health.group.readiness.include=readinessState" })
-class DiscoveryServerIntegrationInstanceEndpointTest {
+class DiscoveryServerIntegrationInstanceEndpointTests {
 
 	private static final String NAMESPACE = "namespace";
 

diff --git a/...rnetes/discoveryserver/HeartbeatTest.java → ...netes/discoveryserver/HeartbeatTests.java b/...rnetes/discoveryserver/HeartbeatTest.java → ...netes/discoveryserver/HeartbeatTests.java
@@ -38,15 +38,15 @@
 /**
  * @author wind57
  */
-@SpringBootTest(classes = HeartbeatTest.TestConfig.class,
+@SpringBootTest(classes = HeartbeatTests.TestConfig.class,
 		properties = { "spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true",
 				/* disable kubernetes from liveness and readiness */
 				"management.health.livenessstate.enabled=true",
 				"management.endpoint.health.group.liveness.include=livenessState",
 				"management.health.readinessstate.enabled=true",
 				"management.endpoint.health.group.readiness.include=readinessState" })
 @AutoConfigureWebTestClient
-class HeartbeatTest {
+class HeartbeatTests {
 
 	@Autowired
 	private WebTestClient client;