diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigMapKubernetesSource.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigMapKubernetesSource.java index 94f0dc57db..49d4c7e28e 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigMapKubernetesSource.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigMapKubernetesSource.java @@ -22,29 +22,13 @@ /** * @author wind57 */ -final class ConfigMapKubernetesSource implements KubernetesSource { +record ConfigMapKubernetesSource(Set serviceNames, Map serviceLabels, + String resourceName) implements KubernetesSource { static final String CONFIGMAP_SERVICE_NAMES_ANNOTATION = "spring.cloud.kubernetes.configmap.apps"; static final String CONFIGMAP_SERVICE_LABELS_ANNOTATION = "spring.cloud.kubernetes.configmap.labels"; - private final Set serviceNames; - - private final Map serviceLabels; - - private final String resourceName; - - ConfigMapKubernetesSource(Set serviceNames, Map serviceLabels, String resourceName) { - this.serviceNames = serviceNames; - this.serviceLabels = serviceLabels; - this.resourceName = resourceName; - } - - @Override - public String resourceName() { - return resourceName; - } - @Override public String description() { return "configmap"; @@ -55,16 +39,6 @@ public String requiredResourceLabel() { return ConfigurationWatcherConfigurationProperties.CONFIG_MAP_LABEL; } - @Override - public Set serviceNames() { - return serviceNames; - } - - @Override - public Map serviceLabels() { - return serviceLabels; - } - @Override public String toString() { return "ConfigMapKubernetesSource{" + "resourceName='" + resourceName + '\'' + ", serviceNames=" + serviceNames diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/SecretKubernetesSource.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/SecretKubernetesSource.java index fb371634c6..be0f56a8e6 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/SecretKubernetesSource.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/SecretKubernetesSource.java @@ -22,29 +22,13 @@ /** * @author wind57 */ -final class SecretKubernetesSource implements KubernetesSource { +record SecretKubernetesSource(Set serviceNames, Map serviceLabels, + String resourceName) implements KubernetesSource { static final String SECRET_SERVICE_NAMES_ANNOTATION = "spring.cloud.kubernetes.secret.apps"; static final String SECRET_SERVICE_LABELS_ANNOTATION = "spring.cloud.kubernetes.secret.labels"; - private final Set serviceNames; - - private final Map serviceLabels; - - private final String resourceName; - - SecretKubernetesSource(Set serviceNames, Map serviceLabels, String resourceName) { - this.serviceNames = serviceNames; - this.serviceLabels = serviceLabels; - this.resourceName = resourceName; - } - - @Override - public String resourceName() { - return resourceName; - } - @Override public String description() { return "secret"; @@ -55,16 +39,6 @@ public String requiredResourceLabel() { return ConfigurationWatcherConfigurationProperties.SECRET_LABEL; } - @Override - public Set serviceNames() { - return serviceNames; - } - - @Override - public Map serviceLabels() { - return serviceLabels; - } - @Override public String toString() { return "SecretKubernetesSource{" + "resourceName='" + resourceName + '\'' + ", serviceNames=" + serviceNames