replace (#1714)

spring-cloud · Sep 9, 2024 · cc19a5d · cc19a5d
1 parent 3149205
commit cc19a5d
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 16 deletions.
diff --git a/...a/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapsCache.java b/...a/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigMapsCache.java
@@ -18,7 +18,6 @@
 
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
@@ -79,7 +78,7 @@ private static List<StrippedSourceContainer> strippedConfigMaps(List<V1ConfigMap
 		return configMaps.stream()
 			.map(configMap -> new StrippedSourceContainer(configMap.getMetadata().getLabels(),
 					configMap.getMetadata().getName(), configMap.getData()))
-			.collect(Collectors.toList());
+			.toList();
 	}
 
 }
diff --git a/...java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsCache.java b/...java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsCache.java
@@ -80,7 +80,7 @@ private static List<StrippedSourceContainer> strippedSecrets(List<V1Secret> secr
 		return secrets.stream()
 			.map(secret -> new StrippedSourceContainer(secret.getMetadata().getLabels(), secret.getMetadata().getName(),
 					transform(secret.getData())))
-			.collect(Collectors.toList());
+			.toList();
 	}
 
 	private static Map<String, String> transform(Map<String, byte[]> in) {

diff --git a/...n/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigProperties.java b/...n/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigProperties.java
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -67,7 +66,7 @@ public List<NormalizedSource> determineSources(Environment environment) {
 		return this.sources.stream()
 			.flatMap(s -> s.normalize(this.name, this.namespace, this.labels, this.includeProfileSpecificSources,
 					this.failFast, this.useNameAsPrefix, environment))
-			.collect(Collectors.toList());
+			.toList();
 	}
 
 	/**

diff --git a/...ain/java/org/springframework/cloud/kubernetes/commons/config/SecretsConfigProperties.java b/...ain/java/org/springframework/cloud/kubernetes/commons/config/SecretsConfigProperties.java
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -68,7 +67,7 @@ public List<NormalizedSource> determineSources(Environment environment) {
 		return this.sources.stream()
 			.flatMap(s -> s.normalize(this.name, this.namespace, this.labels, this.includeProfileSpecificSources,
 					this.failFast, this.useNameAsPrefix, environment))
-			.collect(Collectors.toList());
+			.toList();
 	}
 
 	/**

diff --git a/...main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapsCache.java b/...main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8ConfigMapsCache.java
@@ -18,7 +18,6 @@
 
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.client.KubernetesClient;
@@ -70,7 +69,7 @@ private static List<StrippedSourceContainer> strippedConfigMaps(List<ConfigMap>
 		return configMaps.stream()
 			.map(configMap -> new StrippedSourceContainer(configMap.getMetadata().getLabels(),
 					configMap.getMetadata().getName(), configMap.getData()))
-			.collect(Collectors.toList());
+			.toList();
 	}
 
 }
diff --git a/...rc/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsCache.java b/...rc/main/java/org/springframework/cloud/kubernetes/fabric8/config/Fabric8SecretsCache.java
@@ -18,7 +18,6 @@
 
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.client.KubernetesClient;
@@ -70,7 +69,7 @@ private static List<StrippedSourceContainer> strippedSecrets(List<Secret> secret
 		return secrets.stream()
 			.map(secret -> new StrippedSourceContainer(secret.getMetadata().getLabels(), secret.getMetadata().getName(),
 					secret.getData()))
-			.collect(Collectors.toList());
+			.toList();
 	}
 
 }
diff --git a/...ingframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTest.java b/...ingframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientTest.java
@@ -21,7 +21,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import io.fabric8.kubernetes.api.model.Endpoints;
 import io.fabric8.kubernetes.api.model.EndpointsBuilder;
@@ -302,7 +301,7 @@ void getEndPointsListShouldHandleNamespaces() {
 		assertThat(result_endpoints.stream()
 			.map(Endpoints::getMetadata)
 			.map(ObjectMeta::getNamespace)
-			.collect(Collectors.toList())).containsOnly(namespace1, namespace3);
+			.toList()).containsOnly(namespace1, namespace3);
 	}
 
 	@Test

diff --git a/...va/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesCatalogWatchTest.java b/...va/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesCatalogWatchTest.java
@@ -20,7 +20,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import io.fabric8.kubernetes.api.model.EndpointAddress;
 import io.fabric8.kubernetes.api.model.EndpointSubset;
@@ -318,7 +317,7 @@ void testEndpointsWithoutTargetRefsAllNamespaces() {
 	private EndpointsList createEndpointsListByServiceName(String namespace, String... serviceNames) {
 		List<Endpoints> endpoints = stream(serviceNames)
 			.map(s -> createEndpointsByPodName(namespace, s + "-singlePodUniqueId"))
-			.collect(Collectors.toList());
+			.toList();
 
 		EndpointsList endpointsList = new EndpointsList();
 		endpointsList.setItems(endpoints);

diff --git a/...rt/src/main/java/org/springframework/cloud/kubernetes/tests/discovery/TestsDiscovery.java b/...rt/src/main/java/org/springframework/cloud/kubernetes/tests/discovery/TestsDiscovery.java
@@ -86,7 +86,7 @@ private static void replaceClassloader(List<URL> classpathURLs) {
 	// /tmp/deps.txt is created by the pipeline
 	private static List<String> entireClasspath() throws Exception {
 		try (Stream<String> lines = Files.lines(Paths.get("/tmp/deps.txt"))) {
-			return lines.distinct().collect(Collectors.toList());
+			return lines.distinct().toList();
 		}
 	}