SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix (#816)

Browse Source 
* fix
This commit is contained in:
erabii
2021-07-13 10:44:43 -04:00
committed by GitHub
parent 824b7180af
commit 2bfd50037a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigProperties.java
View File

@@ -71,11 +71,10 @@ public class ConfigMapConfigProperties extends AbstractConfigProperties {
*/
public List<NormalizedSource> 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);
}