Merge branch '3.2.x'

spring-cloud · Jan 20, 2025 · de111c4 · de111c4
2 parents 5ee6d5d + 4e5bbe9
commit de111c4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 194 deletions.
diff --git a/...thEndpointSlicesAndNamespaceFilterIT.java → ...c8CatalogWatchEndpointSlicesFilterIT.java b/...thEndpointSlicesAndNamespaceFilterIT.java → ...c8CatalogWatchEndpointSlicesFilterIT.java
@@ -34,7 +34,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 
-import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.Fabric8CatalogWatchWithEndpointSlicesAndNamespaceFilterIT.TestConfig;
+import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.Fabric8CatalogWatchEndpointSlicesFilterIT.TestConfig;
 import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.TestAssertions.assertLogStatement;
 import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.TestAssertions.invokeAndAssert;
 
@@ -43,7 +43,7 @@
  */
 @SpringBootTest(classes = { KubernetesCatalogWatchAutoConfiguration.class, TestConfig.class, Application.class },
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-class Fabric8CatalogWatchWithEndpointSlicesAndNamespaceFilterIT extends Fabric8CatalogWatchBase {
+class Fabric8CatalogWatchEndpointSlicesFilterIT extends Fabric8CatalogWatchBase {
 
 	@LocalServerPort
 	private int port;

diff --git a/...tchWithEndpointsAndNamespaceFilterIT.java → ...watch/Fabric8CatalogWatchEndpointsIT.java b/...tchWithEndpointsAndNamespaceFilterIT.java → ...watch/Fabric8CatalogWatchEndpointsIT.java
@@ -34,7 +34,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 
-import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.Fabric8CatalogWatchWithEndpointsAndNamespaceFilterIT.TestConfig;
+import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.Fabric8CatalogWatchEndpointsIT.TestConfig;
 import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.TestAssertions.assertLogStatement;
 import static org.springframework.cloud.kubernetes.fabric8.catalog.watch.TestAssertions.invokeAndAssert;
 
@@ -43,7 +43,7 @@
  */
 @SpringBootTest(classes = { KubernetesCatalogWatchAutoConfiguration.class, TestConfig.class, Application.class },
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-class Fabric8CatalogWatchWithEndpointsAndNamespaceFilterIT extends Fabric8CatalogWatchBase {
+class Fabric8CatalogWatchEndpointsIT extends Fabric8CatalogWatchBase {
 
 	@LocalServerPort
 	private int port;

diff --git a/...ework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithEndpointSlicesIT.java b/...ework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithEndpointSlicesIT.java
diff --git a/...gframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithEndpointsIT.java b/...gframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithEndpointsIT.java