Merge pull request #2127 from wind57/k8s-client-simplifications

K8s client simplifications

Author: ryanjbaxter

spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientBlockingAbstractInformerDiscoveryClient.java

@@ -124,13 +124,13 @@ public List<ServiceInstance> getInstances(String serviceId) {
 
 		List<V1Service> allServices = serviceListers.stream()
 			.flatMap(x -> x.list().stream())
-			.filter(scv -> scv.getMetadata() != null)
-			.filter(svc -> serviceId.equals(svc.getMetadata().getName()))
+			.filter(service -> service.getMetadata() != null)
+			.filter(service -> serviceId.equals(service.getMetadata().getName()))
 			.toList();
 
 		List<ServiceInstance> serviceInstances = allServices.stream()
 			.filter(predicate)
-			.flatMap(service -> serviceInstances(service, serviceId).stream())
+			.flatMap(service -> serviceInstances(service).stream())
 			.collect(Collectors.toCollection(ArrayList::new));
 
 		if (properties.includeExternalNameServices()) {
@@ -171,12 +171,15 @@ void preDestroy() {
 		sharedInformerFactories.forEach(SharedInformerFactory::stopAllRegisteredInformers);
 	}
 
-	private List<ServiceInstance> serviceInstances(V1Service service, String serviceId) {
+	private List<ServiceInstance> serviceInstances(V1Service service) {
+
+		String serviceId = service.getMetadata().getName();
+		String serviceNamespace = service.getMetadata().getNamespace();
 
 		List<ServiceInstance> instances = new ArrayList<>();
 
 		List<V1Endpoints> allEndpoints = endpointsListers.stream()
-			.map(endpointsLister -> endpointsLister.namespace(service.getMetadata().getNamespace()).get(serviceId))
+			.map(endpointsLister -> endpointsLister.namespace(serviceNamespace).get(serviceId))
 			.filter(Objects::nonNull)
 			.toList();
 
@@ -195,7 +198,8 @@ private List<ServiceInstance> serviceInstances(V1Service service, String service
 				for (V1EndpointSubset endpointSubset : subsets) {
 
 					Map<String, Integer> endpointsPortData = endpointSubsetsPortData(List.of(endpointSubset));
-					ServicePortNameAndNumber portData = endpointsPort(endpointsPortData, k8sServiceMetadata, properties);
+					ServicePortNameAndNumber portData = endpointsPort(endpointsPortData, k8sServiceMetadata,
+							properties);
 
 					List<V1EndpointAddress> addresses = addresses(endpointSubset, properties);
 					for (V1EndpointAddress endpointAddress : addresses) {

spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientDiscoveryClientTests.java

@@ -247,8 +247,7 @@ void instanceWithoutSubsetsShouldBeSkipped() {
 			.build();
 		endpointsCache.add(endpoints);
 
-		V1Service service = new V1ServiceBuilder()
-			.withSpec(new V1ServiceSpecBuilder().withType("ClusterIP").build())
+		V1Service service = new V1ServiceBuilder().withSpec(new V1ServiceSpecBuilder().withType("ClusterIP").build())
 			.withNewMetadata()
 			.withName("endpoint1")
 			.withNamespace("test")