diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java b/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java index a9808ad3..1d1d8b7c 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java +++ b/spring-cloud-kubernetes-client-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplier.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,6 @@ import org.apache.commons.logging.LogFactory; import reactor.core.publisher.Flux; import org.springframework.cloud.client.ServiceInstance; -import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties; import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; import org.springframework.cloud.kubernetes.commons.loadbalancer.KubernetesServiceInstanceMapper; @@ -41,23 +40,16 @@ public class KubernetesClientServicesListSupplier extends KubernetesServicesList private static final Log LOG = LogFactory.getLog(KubernetesClientServicesListSupplier.class); - private CoreV1Api coreV1Api; + private final CoreV1Api coreV1Api; - private KubernetesClientProperties kubernetesClientProperties; - - private KubernetesNamespaceProvider kubernetesNamespaceProvider; + private final String namespace; public KubernetesClientServicesListSupplier(Environment environment, KubernetesServiceInstanceMapper mapper, KubernetesDiscoveryProperties discoveryProperties, CoreV1Api coreV1Api, KubernetesNamespaceProvider kubernetesNamespaceProvider) { super(environment, mapper, discoveryProperties); this.coreV1Api = coreV1Api; - this.kubernetesNamespaceProvider = kubernetesNamespaceProvider; - } - - private String getNamespace() { - return kubernetesNamespaceProvider != null ? kubernetesNamespaceProvider.getNamespace() - : kubernetesClientProperties.namespace(); + this.namespace = kubernetesNamespaceProvider.getNamespace(); } @Override @@ -71,7 +63,7 @@ public class KubernetesClientServicesListSupplier extends KubernetesServicesList null, null, null, null, null, null, null, null).getItems(); } else { - services = coreV1Api.listNamespacedService(getNamespace(), null, null, null, + services = coreV1Api.listNamespacedService(namespace, null, null, null, "metadata.name=" + this.getServiceId(), null, null, null, null, null, null, null).getItems(); } services.forEach(service -> result.add(mapper.map(service)));