From 9b80a8031ac17a581da73063df7e6c502d78e927 Mon Sep 17 00:00:00 2001 From: erabii Date: Fri, 20 Aug 2021 12:35:12 -0400 Subject: [PATCH] minor improvement (#854) --- .../commons/config/ConfigMapConfigProperties.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigProperties.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigProperties.java index 11c20e06..da3b6a32 100644 --- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigProperties.java +++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigProperties.java @@ -85,7 +85,7 @@ public class ConfigMapConfigProperties extends AbstractConfigProperties { return Collections.singletonList(new NormalizedSource(name, namespace, "")); } - return sources.stream().map(s -> s.normalize(name, namespace, useNameAsPrefix, s.getExplicitPrefix())) + return sources.stream().map(s -> s.normalize(name, namespace, useNameAsPrefix)) .collect(Collectors.toList()); } @@ -173,16 +173,15 @@ public class ConfigMapConfigProperties extends AbstractConfigProperties { return new NormalizedSource(normalizedName, normalizedNamespace, ""); } - public NormalizedSource normalize(String defaultName, String defaultNamespace, boolean defaultUseNameAsPrefix, - String explicitPrefix) { + public NormalizedSource normalize(String defaultName, String defaultNamespace, boolean defaultUseNameAsPrefix) { String normalizedName = StringUtils.hasLength(this.name) ? this.name : defaultName; String normalizedNamespace = StringUtils.hasLength(this.namespace) ? this.namespace : defaultNamespace; // if explicitPrefix is set, it takes priority over useNameAsPrefix // (either the one from 'spring.cloud.kubernetes.config' or // 'spring.cloud.kubernetes.config.sources') - if (StringUtils.hasText(explicitPrefix)) { - return new NormalizedSource(normalizedName, normalizedNamespace, explicitPrefix); + if (StringUtils.hasText(this.explicitPrefix)) { + return new NormalizedSource(normalizedName, normalizedNamespace, this.explicitPrefix); } // useNameAsPrefix is a java.lang.Boolean and if it's != null, users have