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

clean-up (#791)

Browse Source
This commit is contained in:
erabii
2021-05-18 12:54:59 -04:00
committed by GitHub
parent 1a136a5268
commit f43b5c1a45
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,8 +31,6 @@ import org.springframework.util.StringUtils;
@ConfigurationProperties("spring.cloud.kubernetes.config")
public class ConfigMapConfigProperties extends AbstractConfigProperties {
private static final String TARGET = "Config Map";
private boolean enableApi = true;
private List<String> paths = Collections.emptyList();
@@ -82,7 +80,7 @@ public class ConfigMapConfigProperties extends AbstractConfigProperties {
@Override
public String getConfigurationTarget() {
return TARGET;
return "Config Map";
}
/**
@@ -125,12 +123,12 @@ public class ConfigMapConfigProperties extends AbstractConfigProperties {
}
public boolean isEmpty() {
return StringUtils.isEmpty(this.name) && StringUtils.isEmpty(this.namespace);
return !StringUtils.hasLength(this.name) && !StringUtils.hasLength(this.namespace);
}
public NormalizedSource normalize(String defaultName, String defaultNamespace) {
final String normalizedName = StringUtils.isEmpty(this.name) ? defaultName : this.name;
final String normalizedNamespace = StringUtils.isEmpty(this.namespace) ? defaultNamespace : this.namespace;
String normalizedName = StringUtils.hasLength(this.name) ? this.name : defaultName;
String normalizedNamespace = StringUtils.hasLength(this.namespace) ? this.namespace : defaultNamespace;
return new NormalizedSource(normalizedName, normalizedNamespace);
}

23
spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsConfigProperties.java
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.kubernetes.commons.config;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -35,8 +35,6 @@ import org.springframework.util.StringUtils;
@ConfigurationProperties("spring.cloud.kubernetes.secrets")
public class SecretsConfigProperties extends AbstractConfigProperties {
private static final String TARGET = "Secret";
private boolean enableApi = false;
private Map<String, String> labels = new HashMap<>();
@@ -79,7 +77,7 @@ public class SecretsConfigProperties extends AbstractConfigProperties {
@Override
public String getConfigurationTarget() {
return TARGET;
return "Secret";
}
/**
@@ -92,12 +90,9 @@ public class SecretsConfigProperties extends AbstractConfigProperties {
*/
public List<SecretsConfigProperties.NormalizedSource> determineSources() {
if (this.sources.isEmpty()) {
return new ArrayList<SecretsConfigProperties.NormalizedSource>() {
{
add(new SecretsConfigProperties.NormalizedSource(SecretsConfigProperties.this.name,
return Collections
.singletonList(new SecretsConfigProperties.NormalizedSource(SecretsConfigProperties.this.name,
SecretsConfigProperties.this.namespace, SecretsConfigProperties.this.labels));
}
};
}
return this.sources.stream().map(s -> s.normalize(this.name, this.namespace, this.labels))
@@ -155,14 +150,14 @@ public class SecretsConfigProperties extends AbstractConfigProperties {
}
public boolean isEmpty() {
return StringUtils.isEmpty(this.name) && StringUtils.isEmpty(this.namespace);
return !StringUtils.hasLength(this.name) && !StringUtils.hasLength(this.namespace);
}
public SecretsConfigProperties.NormalizedSource normalize(String defaultName, String defaultNamespace,
Map<String, String> defaultLabels) {
final String normalizedName = StringUtils.isEmpty(this.name) ? defaultName : this.name;
final String normalizedNamespace = StringUtils.isEmpty(this.namespace) ? defaultNamespace : this.namespace;
final Map<String, String> normalizedLabels = this.labels.isEmpty() ? defaultLabels : this.labels;
String normalizedName = StringUtils.hasLength(this.name) ? this.name : defaultName;
String normalizedNamespace = StringUtils.hasLength(this.namespace) ? this.namespace : defaultNamespace;
Map<String, String> normalizedLabels = this.labels.isEmpty() ? defaultLabels : this.labels;
return new SecretsConfigProperties.NormalizedSource(normalizedName, normalizedNamespace, normalizedLabels);
}
@@ -175,7 +170,7 @@ public class SecretsConfigProperties extends AbstractConfigProperties {
private final String namespace;
private Map<String, String> labels = new HashMap<>();
private final Map<String, String> labels;
NormalizedSource(String name, String namespace, Map<String, String> labels) {
this.name = name;