Merge branch 'main' into refactor_without_using_k3s_in_unit_tests

wind57 · wind57 · commit 62c9b64886f2 · 2025-10-20T15:03:40.000+03:00
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/configmap_retry/ConfigMapEnableRetryWithoutFailFastTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/configmap_retry/ConfigMapEnableRetryWithoutFailFastTest.java
@@ -86,8 +86,7 @@ public static void setup() {
 	private static void stubConfigMapAndSecretsDefaults() {
 		// return empty config map / secret list to not fail context creation
 		stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1ConfigMapList()))));
-		stubFor(get(SECRETS_API)
-			.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));
+		stubFor(get(SECRETS_API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));
 	}
 
 	@AfterAll
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/configmap_retry/ConfigRetryDisabledButSecretsRetryEnabled.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/configmap_retry/ConfigRetryDisabledButSecretsRetryEnabled.java
@@ -77,8 +77,7 @@ static void setup() {
 	private static void stubConfigMapAndSecretsDefaults() {
 		// return empty config map / secret list to not fail context creation
 		stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1ConfigMapList()))));
-		stubFor(get(SECRETS_API)
-			.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));
+		stubFor(get(SECRETS_API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));
 	}
 
 	@AfterAll
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsEnableRetryWithoutFailFastTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsEnableRetryWithoutFailFastTest.java
@@ -86,8 +86,7 @@ public static void setup() {
 	private static void stubConfigMapAndSecretsDefaults() {
 		// return empty config map / secret list to not fail context creation
 		stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1ConfigMapList()))));
-		stubFor(get(SECRETS_API)
-			.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));
+		stubFor(get(SECRETS_API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));
 	}
 
 	@AfterAll
diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java
@@ -252,9 +252,8 @@ void selectiveNamespacesTest(CapturedOutput output) {
 			.willReturn(aResponse().withStatus(200)
 				.withBody(JSON.serialize(SERVICE_A_DEFAULT_NAMESPACE_SELECTIVE_NAMESPACES))));
 
-		stubFor(get(urlEqualTo("/api/v1/namespaces/test/services?fieldSelector=metadata.name%3Dservice-a"))
-			.willReturn(aResponse().withStatus(200)
-				.withBody(JSON.serialize(SERVICE_A_TEST_NAMESPACE_SELECTIVE_NAMESPACES))));
+		stubFor(get(urlEqualTo("/api/v1/namespaces/test/services?fieldSelector=metadata.name%3Dservice-a")).willReturn(
+				aResponse().withStatus(200).withBody(JSON.serialize(SERVICE_A_TEST_NAMESPACE_SELECTIVE_NAMESPACES))));
 
 		stubFor(get(urlEqualTo("/api/v1/namespaces/no-service/services?fieldSelector=metadata.name%3Dservice-a"))
 			.willReturn(aResponse().withStatus(404)));

Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,7 @@ public static void setup() {`
`86`	`86`	`private static void stubConfigMapAndSecretsDefaults() {`
`87`	`87`	`// return empty config map / secret list to not fail context creation`
`88`	`88`	`stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1ConfigMapList()))));`
`89`		`- stubFor(get(SECRETS_API)`
`90`		`- .willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));`
	`89`	`+ stubFor(get(SECRETS_API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));`
`91`	`90`	`}`
`92`	`91`
`93`	`92`	`@AfterAll`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,7 @@ static void setup() {`
`77`	`77`	`private static void stubConfigMapAndSecretsDefaults() {`
`78`	`78`	`// return empty config map / secret list to not fail context creation`
`79`	`79`	`stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1ConfigMapList()))));`
`80`		`- stubFor(get(SECRETS_API)`
`81`		`- .willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));`
	`80`	`+ stubFor(get(SECRETS_API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));`
`82`	`81`	`}`
`83`	`82`
`84`	`83`	`@AfterAll`