Merge pull request #2073 from wind57/change_code_for_json_serialization

ryanjbaxter · web-flow · commit ada98d27e9db · 2025-10-15T11:56:27.000-04:00
change serialization code in tests
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigReloadAutoConfigurationTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigReloadAutoConfigurationTest.java
@@ -117,7 +117,7 @@ void beforeEach() {
 			.build());
 
 		WireMock.stubFor(get(urlMatching("^/api/v1/namespaces/default/configmaps.*"))
-			.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(TEST_CONFIGMAP))));
+			.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(TEST_CONFIGMAP))));
 	}
 
 	// 1. watchers
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/BootstrapKubernetesClientSanitizeEnvEndpointStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/BootstrapKubernetesClientSanitizeEnvEndpointStub.java
@@ -92,10 +92,10 @@ public static void stubData() {
 		secretList.addItemsItem(secretTwo);
 
 		WireMock.stubFor(WireMock.get("/api/v1/namespaces/test/configmaps")
-			.willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(configMapList))));
+			.willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(configMapList))));
 
 		WireMock.stubFor(WireMock.get("/api/v1/namespaces/test/secrets")
-			.willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(secretList))));
+			.willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(secretList))));
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/LabeledConfigMapWithPrefixConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/LabeledConfigMapWithPrefixConfigurationStub.java
@@ -106,7 +106,7 @@ public static void stubData() {
 		configMapList.addItemsItem(four);
 
 		WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/configmaps")
-			.willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(configMapList))));
+			.willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(configMapList))));
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/LabeledConfigMapWithProfileConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/LabeledConfigMapWithProfileConfigurationStub.java
@@ -173,7 +173,7 @@ public static void stubData() {
 		configMaps.addItemsItem(greenPurpleConfigMapK8s);
 
 		WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/configmaps")
-			.willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(configMaps))));
+			.willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(configMaps))));
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/LabeledSecretWithPrefixConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/LabeledSecretWithPrefixConfigurationStub.java
@@ -109,7 +109,7 @@ public static void stubData() {
 		secrets.addItemsItem(four);
 
 		WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/secrets")
-			.willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(secrets))));
+			.willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(secrets))));
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/LabeledSecretWithProfileConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/LabeledSecretWithProfileConfigurationStub.java
@@ -174,7 +174,7 @@ public static void stubData() {
 		secrets.addItemsItem(greenPurpleSecretK8s);
 
 		WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/secrets")
-			.willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(secrets))));
+			.willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(secrets))));
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/NamedConfigMapWithPrefixConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/NamedConfigMapWithPrefixConfigurationStub.java
@@ -94,7 +94,7 @@ public static void stubData() {
 
 		// the actual stub for CoreV1Api calls
 		WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/configmaps")
-			.willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(allConfigMaps))));
+			.willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(allConfigMaps))));
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/NamedConfigMapWithProfileConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/NamedConfigMapWithProfileConfigurationStub.java
@@ -106,7 +106,7 @@ public static void stubData() {
 
 		// the actual stub for CoreV1Api calls
 		WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/configmaps")
-			.willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(allConfigMaps))));
+			.willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(allConfigMaps))));
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/NamedSecretWithPrefixConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/NamedSecretWithPrefixConfigurationStub.java
@@ -93,7 +93,7 @@ public static void stubData() {
 
 		// the actual stub for CoreV1Api calls
 		WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/secrets")
-			.willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(allSecrets))));
+			.willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(allSecrets))));
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/NamedSecretWithProfileConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/NamedSecretWithProfileConfigurationStub.java
@@ -123,7 +123,7 @@ public static void stubData() {
 
 		// the actual stub for CoreV1Api calls
 		WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/secrets")
-			.willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(allSecrets))));
+			.willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(allSecrets))));
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/SingleSourceMultipleFilesConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/SingleSourceMultipleFilesConfigurationStub.java
@@ -83,7 +83,7 @@ public static void stubData() {
 
 		// the actual stub for CoreV1Api calls
 		WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/configmaps")
-			.willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(allConfigMaps))));
+			.willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(allConfigMaps))));
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/SourcesOrderConfigurationStub.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/bootstrap/stubs/SourcesOrderConfigurationStub.java
@@ -83,7 +83,7 @@ public static void stubConfigMapData() {
 
 		// the actual stub for CoreV1Api calls
 		WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/configmaps")
-			.willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(allConfigMaps))));
+			.willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(allConfigMaps))));
 	}
 
 	public static void stubSecretsData() {
@@ -105,7 +105,7 @@ public static void stubSecretsData() {
 
 		// the actual stub for CoreV1Api calls
 		WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/secrets")
-			.willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(allConfigMaps))));
+			.willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(allConfigMaps))));
 	}
 
 }
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/configmap_retry/ConfigFailFastDisabled.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/configmap_retry/ConfigFailFastDisabled.java
@@ -68,7 +68,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(new JSON().serialize(new V1ConfigMapList()))));
+		stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1ConfigMapList()))));
 	}
 
 	@AfterAll
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/configmap_retry/ConfigFailFastEnabledButRetryDisabled.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/configmap_retry/ConfigFailFastEnabledButRetryDisabled.java
@@ -74,7 +74,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(new JSON().serialize(new V1ConfigMapList()))));
+		stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1ConfigMapList()))));
 	}
 
 	@AfterAll
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
@@ -85,9 +85,9 @@ 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(new JSON().serialize(new V1ConfigMapList()))));
+		stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1ConfigMapList()))));
 		stubFor(get(SECRETS_API)
-			.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(new V1SecretList()))));
+			.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
@@ -76,9 +76,9 @@ 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(new JSON().serialize(new V1ConfigMapList()))));
+		stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1ConfigMapList()))));
 		stubFor(get(SECRETS_API)
-			.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(new V1SecretList()))));
+			.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/ConfigRetryEnabled.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/configmap_retry/ConfigRetryEnabled.java
@@ -80,7 +80,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(new JSON().serialize(new V1ConfigMapList()))));
+		stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1ConfigMapList()))));
 	}
 
 	@AfterAll
@@ -108,7 +108,7 @@ void locateShouldNotRetryWhenThereIsNoFailure() {
 		V1ConfigMapList configMapList = new V1ConfigMapList()
 			.addItemsItem(new V1ConfigMap().metadata(new V1ObjectMeta().name("application")).data(data));
 
-		stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(configMapList))));
+		stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(configMapList))));
 
 		PropertySource<?>[] propertySource = new PropertySource<?>[1];
 		Assertions.assertThatCode(() -> propertySource[0] = propertySourceLocator.locate(new MockEnvironment()))
@@ -151,7 +151,7 @@ void locateShouldRetryAndRecover() {
 		// then succeed
 		stubFor(get(API).inScenario("Retry and Recover")
 			.whenScenarioStateIs("Failed thrice")
-			.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(configMapList))));
+			.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(configMapList))));
 
 		PropertySource<?>[] propertySource = new PropertySource<?>[1];
 		Assertions.assertThatCode(() -> propertySource[0] = propertySourceLocator.locate(new MockEnvironment()))
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetectorTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetectorTests.java
@@ -124,14 +124,14 @@ void watch() {
 		stubFor(get(urlMatching("^/api/v1/namespaces/default/configmaps.*")).inScenario("watch")
 			.whenScenarioStateIs("update")
 			.withQueryParam("watch", equalTo("true"))
-			.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(watchResponse)))
+			.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(watchResponse)))
 			.willSetStateTo("add"));
 
 		stubFor(get(urlMatching("^/api/v1/namespaces/default/configmaps.*")).inScenario("watch")
 			.whenScenarioStateIs("add")
 			.withQueryParam("watch", equalTo("true"))
 			.willReturn(aResponse().withStatus(200)
-				.withBody(new JSON().serialize(new Watch.Response<>(EventType.ADDED.name(),
+				.withBody(JSON.serialize(new Watch.Response<>(EventType.ADDED.name(),
 						new V1ConfigMap().kind("ConfigMap")
 							.metadata(new V1ObjectMeta().namespace("default").name("bar3"))
 							.putDataItem(Constants.APPLICATION_PROPERTIES, "debug=true")))))
@@ -141,7 +141,7 @@ void watch() {
 			.whenScenarioStateIs("delete")
 			.withQueryParam("watch", equalTo("true"))
 			.willReturn(aResponse().withStatus(200)
-				.withBody(new JSON().serialize(new Watch.Response<>(EventType.DELETED.name(),
+				.withBody(JSON.serialize(new Watch.Response<>(EventType.DELETED.name(),
 						new V1ConfigMap().kind("ConfigMap")
 							.metadata(new V1ObjectMeta().namespace("default").name("bar1"))
 							.putDataItem(Constants.APPLICATION_PROPERTIES, "debug=true")))))
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetectorTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetectorTests.java
@@ -113,20 +113,20 @@ void watch() {
 		stubFor(get(urlMatching("/api/v1/namespaces/default/secrets.*")).inScenario(SCENARIO)
 			.whenScenarioStateIs(STARTED)
 			.withQueryParams(WATCH_FALSE)
-			.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(secretList)))
+			.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(secretList)))
 			.willSetStateTo("update"));
 
 		stubFor(get(urlMatching("/api/v1/namespaces/default/secrets.*")).inScenario(SCENARIO)
 			.whenScenarioStateIs("update")
 			.withQueryParams(WATCH_TRUE)
-			.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(watchResponse)))
+			.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(watchResponse)))
 			.willSetStateTo("add"));
 
 		stubFor(get(urlMatching("/api/v1/namespaces/default/secrets.*")).inScenario(SCENARIO)
 			.whenScenarioStateIs("add")
 			.withQueryParams(WATCH_TRUE)
 			.willReturn(aResponse().withStatus(200)
-				.withBody(new JSON().serialize(new Watch.Response<>(EventType.ADDED.name(),
+				.withBody(JSON.serialize(new Watch.Response<>(EventType.ADDED.name(),
 						new V1Secret().metadata(new V1ObjectMeta().name("rabbit-password"))
 							.putDataItem("rabbit-pw", Base64.getEncoder().encode("password".getBytes()))))))
 			.willSetStateTo("delete"));
@@ -135,7 +135,7 @@ void watch() {
 			.whenScenarioStateIs("delete")
 			.withQueryParams(WATCH_TRUE)
 			.willReturn(aResponse().withStatus(200)
-				.withBody(new JSON().serialize(new Watch.Response<>(EventType.DELETED.name(),
+				.withBody(JSON.serialize(new Watch.Response<>(EventType.DELETED.name(),
 						new V1Secret().metadata(new V1ObjectMeta().name("rabbit-password"))
 							.putDataItem("rabbit-pw", Base64.getEncoder().encode("password".getBytes()))))))
 			.willSetStateTo("done"));
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadConfigMapTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadConfigMapTest.java
@@ -163,7 +163,7 @@ void test(CapturedOutput output) {
 		// second call passes (change data so that reload is triggered)
 		V1ConfigMap configMap = configMap(CONFIG_MAP_NAME, Map.of("a", "b"));
 		V1ConfigMapList configMapList = new V1ConfigMapList().addItemsItem(configMap);
-		stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(configMapList)))
+		stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(configMapList)))
 			.inScenario(SCENARIO_NAME)
 			.whenScenarioStateIs("go-to-ok")
 			.willSetStateTo("done"));
@@ -205,7 +205,7 @@ AbstractEnvironment environment() {
 
 			// needed so that our environment is populated with 'something'
 			// this call is done in the method that returns the AbstractEnvironment
-			stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(configMapList)))
+			stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(configMapList)))
 				.inScenario(SCENARIO_NAME)
 				.whenScenarioStateIs(Scenario.STARTED)
 				.willSetStateTo("go-to-fail"));
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadSecretTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadSecretTest.java
@@ -164,7 +164,7 @@ void test(CapturedOutput output) {
 		// second call passes (change data so that reload is triggered)
 		V1Secret secret = secret(SECRET_NAME, Map.of("a", "b"));
 		V1SecretList secretList = new V1SecretList().addItemsItem(secret);
-		stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(secretList)))
+		stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(secretList)))
 			.inScenario(SCENARIO_NAME)
 			.whenScenarioStateIs("go-to-ok")
 			.willSetStateTo("done"));
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java
@@ -139,7 +139,7 @@ void test(CapturedOutput output) {
 		// second reload call passes
 		V1ConfigMap configMapTwo = configMap(CONFIG_MAP_NAME, Map.of("a", "b"));
 		V1ConfigMapList listTwo = new V1ConfigMapList().addItemsItem(configMapTwo);
-		stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(listTwo)))
+		stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(listTwo)))
 			.inScenario(SCENARIO_NAME)
 			.whenScenarioStateIs("go-to-ok")
 			.willSetStateTo("done"));
@@ -181,7 +181,7 @@ AbstractEnvironment environment() {
 
 			// needed so that our environment is populated with 'something'
 			// this call is done in the method that returns the AbstractEnvironment
-			stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(listOne)))
+			stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(listOne)))
 				.inScenario(SCENARIO_NAME)
 				.whenScenarioStateIs(Scenario.STARTED)
 				.willSetStateTo("go-to-fail"));
diff --git a/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java
@@ -138,7 +138,7 @@ void test(CapturedOutput output) {
 
 		V1Secret secretTwo = secret(SECRET_NAME, Map.of("a", "b"));
 		V1SecretList listTwo = new V1SecretList().addItemsItem(secretTwo);
-		stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(listTwo)))
+		stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(listTwo)))
 			.inScenario(SCENARIO_NAME)
 			.willSetStateTo("done")
 			.whenScenarioStateIs("go-to-ok"));
@@ -183,7 +183,7 @@ AbstractEnvironment environment() {
 
 			// needed so that our environment is populated with 'something'
 			// this call is done in the method that returns the AbstractEnvironment
-			stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(listOne)))
+			stubFor(get(PATH).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(listOne)))
 				.inScenario(SCENARIO_NAME)
 				.whenScenarioStateIs(Scenario.STARTED)
 				.willSetStateTo("go-to-fail"));
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
@@ -85,9 +85,9 @@ 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(new JSON().serialize(new V1ConfigMapList()))));
+		stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1ConfigMapList()))));
 		stubFor(get(SECRETS_API)
-			.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(new V1SecretList()))));
+			.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/SecretsRetryEnabledTests.java b/spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryEnabledTests.java
@@ -115,7 +115,7 @@ void locateShouldNotRetryWhenThereIsNoFailure() {
 		V1SecretList secretList = new V1SecretList()
 			.addItemsItem(new V1Secret().metadata(new V1ObjectMeta().name("my-secret")).data(data));
 
-		stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(secretList))));
+		stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(secretList))));
 
 		final PropertySource<?>[] propertySource = new PropertySource<?>[1];
 		Assertions.assertThatCode(() -> propertySource[0] = propertySourceLocator.locate(new MockEnvironment()))
@@ -158,7 +158,7 @@ void locateShouldRetryAndRecover() {
 		// then succeed
 		stubFor(get(API).inScenario("Retry and Recover")
 			.whenScenarioStateIs("Failed thrice")
-			.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(secretList))));
+			.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(secretList))));
 
 		final PropertySource<?>[] propertySource = new PropertySource<?>[1];
 		Assertions.assertThatNoException()
diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientConfigServerBootstrapperTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientConfigServerBootstrapperTests.java
@@ -126,11 +126,11 @@ public void before() throws JsonProcessingException {
 			.withHeader("content-type", "application/json")));
 		stubFor(get("/api/v1/namespaces/default/endpoints?resourceVersion=0&watch=false")
 			.willReturn(aResponse().withStatus(200)
-				.withBody(new JSON().serialize(ENDPOINTS_LIST))
+				.withBody(JSON.serialize(ENDPOINTS_LIST))
 				.withHeader("content-type", "application/json")));
 		stubFor(get("/api/v1/namespaces/default/services?resourceVersion=0&watch=false")
 			.willReturn(aResponse().withStatus(200)
-				.withBody(new JSON().serialize(SERVICE_LIST))
+				.withBody(JSON.serialize(SERVICE_LIST))
 				.withHeader("content-type", "application/json")));
 		stubFor(get(urlMatching("/api/v1/namespaces/default/services.*.watch=true"))
 			.willReturn(aResponse().withStatus(200)));
diff --git a/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientDiscoveryClientAutoConfigurationTests.java b/spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientDiscoveryClientAutoConfigurationTests.java
@@ -92,12 +92,12 @@ ApiClient apiClient() {
 			WireMock.configureFor(wireMockServer.port());
 			stubFor(get("/api/v1/namespaces/test/endpoints?resourceVersion=0&watch=false")
 				.willReturn(aResponse().withStatus(200)
-					.withBody(new JSON().serialize(new V1EndpointsListBuilder()
+					.withBody(JSON.serialize(new V1EndpointsListBuilder()
 						.withMetadata(new V1ListMetaBuilder().withResourceVersion("0").build())
 						.build()))));
 			stubFor(get("/api/v1/namespaces/test/services?resourceVersion=0&watch=false")
 				.willReturn(aResponse().withStatus(200)
-					.withBody(new JSON().serialize(new V1ServiceListBuilder()
+					.withBody(JSON.serialize(new V1ServiceListBuilder()
 						.withMetadata(new V1ListMetaBuilder().withResourceVersion("0").build())
 						.build()))));
 			return new ClientBuilder().setBasePath(wireMockServer.baseUrl()).build();
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
diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Util.java b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Util.java
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/configurations/SecondConfig.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/configurations/SecondConfig.java

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ void beforeEach() {`
`117`	`117`	`.build());`
`118`	`118`
`119`	`119`	`WireMock.stubFor(get(urlMatching("^/api/v1/namespaces/default/configmaps.*"))`
`120`		`- .willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(TEST_CONFIGMAP))));`
	`120`	`+ .willReturn(aResponse().withStatus(200).withBody(JSON.serialize(TEST_CONFIGMAP))));`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`// 1. watchers`
Original file line number	Diff line number	Diff line change
`@@ -92,10 +92,10 @@ public static void stubData() {`
`92`	`92`	`secretList.addItemsItem(secretTwo);`
`93`	`93`
`94`	`94`	`WireMock.stubFor(WireMock.get("/api/v1/namespaces/test/configmaps")`
`95`		`- .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(configMapList))));`
	`95`	`+ .willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(configMapList))));`
`96`	`96`
`97`	`97`	`WireMock.stubFor(WireMock.get("/api/v1/namespaces/test/secrets")`
`98`		`- .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(secretList))));`
	`98`	`+ .willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(secretList))));`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public static void stubData() {`
`106`	`106`	`configMapList.addItemsItem(four);`
`107`	`107`
`108`	`108`	`WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/configmaps")`
`109`		`- .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(configMapList))));`
	`109`	`+ .willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(configMapList))));`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public static void stubData() {`
`173`	`173`	`configMaps.addItemsItem(greenPurpleConfigMapK8s);`
`174`	`174`
`175`	`175`	`WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/configmaps")`
`176`		`- .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(configMaps))));`
	`176`	`+ .willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(configMaps))));`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public static void stubData() {`
`109`	`109`	`secrets.addItemsItem(four);`
`110`	`110`
`111`	`111`	`WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/secrets")`
`112`		`- .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(secrets))));`
	`112`	`+ .willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(secrets))));`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public static void stubData() {`
`174`	`174`	`secrets.addItemsItem(greenPurpleSecretK8s);`
`175`	`175`
`176`	`176`	`WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/secrets")`
`177`		`- .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(secrets))));`
	`177`	`+ .willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(secrets))));`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public static void stubData() {`
`94`	`94`
`95`	`95`	`// the actual stub for CoreV1Api calls`
`96`	`96`	`WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/configmaps")`
`97`		`- .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(allConfigMaps))));`
	`97`	`+ .willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(allConfigMaps))));`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public static void stubData() {`
`93`	`93`
`94`	`94`	`// the actual stub for CoreV1Api calls`
`95`	`95`	`WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/secrets")`
`96`		`- .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(allSecrets))));`
	`96`	`+ .willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(allSecrets))));`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public static void stubData() {`
`123`	`123`
`124`	`124`	`// the actual stub for CoreV1Api calls`
`125`	`125`	`WireMock.stubFor(WireMock.get("/api/v1/namespaces/spring-k8s/secrets")`
`126`		`- .willReturn(WireMock.aResponse().withStatus(200).withBody(new JSON().serialize(allSecrets))));`
	`126`	`+ .willReturn(WireMock.aResponse().withStatus(200).withBody(JSON.serialize(allSecrets))));`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`}`