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 4cb0377e..fed95bfa 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 @@ -71,11 +71,10 @@ public class ConfigMapConfigProperties extends AbstractConfigProperties { */ public List determineSources() { if (this.sources.isEmpty()) { - return Collections.singletonList(new NormalizedSource(ConfigMapConfigProperties.this.name, - ConfigMapConfigProperties.this.namespace)); + return Collections.singletonList(new NormalizedSource(name, namespace)); } - return this.sources.stream().map(s -> s.normalize(this.name, this.namespace)).collect(Collectors.toList()); + return sources.stream().map(s -> s.normalize(name, namespace)).collect(Collectors.toList()); } @Override @@ -99,6 +98,7 @@ public class ConfigMapConfigProperties extends AbstractConfigProperties { private String namespace; public Source() { + } public Source(String name, String namespace) { @@ -129,7 +129,6 @@ public class ConfigMapConfigProperties extends AbstractConfigProperties { public NormalizedSource normalize(String defaultName, String defaultNamespace) { String normalizedName = StringUtils.hasLength(this.name) ? this.name : defaultName; String normalizedNamespace = StringUtils.hasLength(this.namespace) ? this.namespace : defaultNamespace; - return new NormalizedSource(normalizedName, normalizedNamespace); }