From 70d85f658587a908bfcd2dd6e47fa2f3eb9c18da Mon Sep 17 00:00:00 2001 From: erabii Date: Thu, 30 Nov 2023 00:06:07 +0200 Subject: [PATCH] kubernetes discovery minor changes part 2 (#1522) * minor changes * minor changes * minor changes * minor simplification part 2 --- .../kubernetes/discovery/KubernetesDiscoveryClient.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java index 409c0bfd..b22ea869 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java @@ -34,12 +34,15 @@ public class KubernetesDiscoveryClient implements DiscoveryClient { private final KubernetesDiscoveryClientProperties properties; + private final boolean emptyNamespaces; + public KubernetesDiscoveryClient(RestTemplate rest, KubernetesDiscoveryClientProperties properties) { if (!StringUtils.hasText(properties.getDiscoveryServerUrl())) { throw new DiscoveryServerUrlInvalidException(); } this.rest = rest; this.properties = properties; + this.emptyNamespaces = properties.getNamespaces().isEmpty(); } @Override @@ -68,10 +71,7 @@ public class KubernetesDiscoveryClient implements DiscoveryClient { } private boolean matchNamespaces(KubernetesServiceInstance kubernetesServiceInstance) { - if (properties.getNamespaces().isEmpty()) { - return true; - } - return properties.getNamespaces().contains(kubernetesServiceInstance.getNamespace()); + return emptyNamespaces || properties.getNamespaces().contains(kubernetesServiceInstance.getNamespace()); } private boolean matchNamespaces(Service service) {