Skip to content

Commit ae10e54

Browse files
ryanjbaxterryanjbaxter
authored
Merge pull request #2025 from wind57/simplify_config_reload
simplify arguments
2 parents eae86bd + 34cd596 commit ae10e54

File tree

7 files changed

+29
-15
lines changed

7 files changed

+29
-15
lines changed

‎spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetector.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ public class KubernetesClientEventBasedConfigMapChangeDetector extends Configura
6767

6868
private final Set<String> namespaces;
6969

70+
private final ConfigurableEnvironment environment;
71+
7072
private final boolean enableReloadFiltering;
7173

7274
private final ResourceEventHandler<V1ConfigMap> handler = new ResourceEventHandler<>() {
@@ -102,7 +104,8 @@ public KubernetesClientEventBasedConfigMapChangeDetector(CoreV1Api coreV1Api, Co
102104
ConfigReloadProperties properties, ConfigurationUpdateStrategy strategy,
103105
KubernetesClientConfigMapPropertySourceLocator propertySourceLocator,
104106
KubernetesNamespaceProvider kubernetesNamespaceProvider) {
105-
super(environment, properties, strategy);
107+
super(strategy);
108+
this.environment = environment;
106109
this.propertySourceLocator = propertySourceLocator;
107110
this.coreV1Api = coreV1Api;
108111
this.apiClient = createApiClientForInformerClient();

‎spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetector.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ public class KubernetesClientEventBasedSecretsChangeDetector extends Configurati
6969

7070
private final Set<String> namespaces;
7171

72+
private final ConfigurableEnvironment environment;
73+
7274
private final boolean enableReloadFiltering;
7375

7476
private final ResourceEventHandler<V1Secret> handler = new ResourceEventHandler<>() {
@@ -105,7 +107,8 @@ public KubernetesClientEventBasedSecretsChangeDetector(CoreV1Api coreV1Api, Conf
105107
ConfigReloadProperties properties, ConfigurationUpdateStrategy strategy,
106108
KubernetesClientSecretsPropertySourceLocator propertySourceLocator,
107109
KubernetesNamespaceProvider kubernetesNamespaceProvider) {
108-
super(environment, properties, strategy);
110+
super(strategy);
111+
this.environment = environment;
109112
this.propertySourceLocator = propertySourceLocator;
110113
this.coreV1Api = coreV1Api;
111114
this.apiClient = createApiClientForInformerClient();

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigurationChangeDetector.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import org.apache.commons.logging.LogFactory;
2222

23-
import org.springframework.core.env.ConfigurableEnvironment;
2423
import org.springframework.core.log.LogAccessor;
2524

2625
/**
@@ -33,16 +32,9 @@ public abstract class ConfigurationChangeDetector {
3332

3433
private static final LogAccessor LOG = new LogAccessor(LogFactory.getLog(ConfigurationChangeDetector.class));
3534

36-
protected ConfigurableEnvironment environment;
37-
38-
protected ConfigReloadProperties properties;
39-
4035
protected ConfigurationUpdateStrategy strategy;
4136

42-
public ConfigurationChangeDetector(ConfigurableEnvironment environment, ConfigReloadProperties properties,
43-
ConfigurationUpdateStrategy strategy) {
44-
this.environment = Objects.requireNonNull(environment);
45-
this.properties = Objects.requireNonNull(properties);
37+
public ConfigurationChangeDetector(ConfigurationUpdateStrategy strategy) {
4638
this.strategy = Objects.requireNonNull(strategy);
4739
}
4840

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/reload/PollingConfigMapChangeDetector.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
2626
import org.springframework.core.env.AbstractEnvironment;
27+
import org.springframework.core.env.ConfigurableEnvironment;
2728
import org.springframework.core.env.MapPropertySource;
2829
import org.springframework.scheduling.TaskScheduler;
2930
import org.springframework.scheduling.support.PeriodicTrigger;
@@ -46,14 +47,17 @@ public class PollingConfigMapChangeDetector extends ConfigurationChangeDetector
4647

4748
private final TaskScheduler taskExecutor;
4849

50+
private final ConfigurableEnvironment environment;
51+
4952
private final long period;
5053

5154
private final boolean monitorConfigMaps;
5255

5356
public PollingConfigMapChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties,
5457
ConfigurationUpdateStrategy strategy, Class<? extends MapPropertySource> propertySourceClass,
5558
PropertySourceLocator propertySourceLocator, TaskScheduler taskExecutor) {
56-
super(environment, properties, strategy);
59+
super(strategy);
60+
this.environment = environment;
5761
this.propertySourceLocator = propertySourceLocator;
5862
this.propertySourceClass = propertySourceClass;
5963
this.taskExecutor = taskExecutor;

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/reload/PollingSecretsChangeDetector.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
2626
import org.springframework.core.env.AbstractEnvironment;
27+
import org.springframework.core.env.ConfigurableEnvironment;
2728
import org.springframework.core.env.MapPropertySource;
2829
import org.springframework.scheduling.TaskScheduler;
2930
import org.springframework.scheduling.support.PeriodicTrigger;
@@ -46,14 +47,17 @@ public class PollingSecretsChangeDetector extends ConfigurationChangeDetector {
4647

4748
private final TaskScheduler taskExecutor;
4849

50+
private final ConfigurableEnvironment environment;
51+
4952
private final long period;
5053

5154
private final boolean monitorSecrets;
5255

5356
public PollingSecretsChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties,
5457
ConfigurationUpdateStrategy strategy, Class<? extends MapPropertySource> propertySourceClass,
5558
PropertySourceLocator propertySourceLocator, TaskScheduler taskExecutor) {
56-
super(environment, properties, strategy);
59+
super(strategy);
60+
this.environment = environment;
5761
this.propertySourceLocator = propertySourceLocator;
5862
this.propertySourceClass = propertySourceClass;
5963
this.taskExecutor = taskExecutor;

‎spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/Fabric8EventBasedConfigMapChangeDetector.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.springframework.cloud.kubernetes.fabric8.config.Fabric8ConfigMapPropertySource;
3939
import org.springframework.cloud.kubernetes.fabric8.config.Fabric8ConfigMapPropertySourceLocator;
4040
import org.springframework.core.env.AbstractEnvironment;
41+
import org.springframework.core.env.ConfigurableEnvironment;
4142
import org.springframework.core.log.LogAccessor;
4243

4344
import static org.springframework.cloud.kubernetes.fabric8.config.Fabric8ConfigUtils.namespaces;
@@ -63,13 +64,16 @@ public class Fabric8EventBasedConfigMapChangeDetector extends ConfigurationChang
6364

6465
private final Set<String> namespaces;
6566

67+
private final ConfigurableEnvironment environment;
68+
6669
private final boolean enableReloadFiltering;
6770

6871
public Fabric8EventBasedConfigMapChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties,
6972
KubernetesClient kubernetesClient, ConfigurationUpdateStrategy strategy,
7073
Fabric8ConfigMapPropertySourceLocator fabric8ConfigMapPropertySourceLocator,
7174
KubernetesNamespaceProvider namespaceProvider) {
72-
super(environment, properties, strategy);
75+
super(strategy);
76+
this.environment = environment;
7377
this.kubernetesClient = kubernetesClient;
7478
this.fabric8ConfigMapPropertySourceLocator = fabric8ConfigMapPropertySourceLocator;
7579
this.enableReloadFiltering = properties.enableReloadFiltering();

‎spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/Fabric8EventBasedSecretsChangeDetector.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.springframework.cloud.kubernetes.fabric8.config.Fabric8SecretsPropertySource;
3939
import org.springframework.cloud.kubernetes.fabric8.config.Fabric8SecretsPropertySourceLocator;
4040
import org.springframework.core.env.AbstractEnvironment;
41+
import org.springframework.core.env.ConfigurableEnvironment;
4142
import org.springframework.core.log.LogAccessor;
4243

4344
import static org.springframework.cloud.kubernetes.fabric8.config.Fabric8ConfigUtils.namespaces;
@@ -63,13 +64,16 @@ public class Fabric8EventBasedSecretsChangeDetector extends ConfigurationChangeD
6364

6465
private final Set<String> namespaces;
6566

67+
private final ConfigurableEnvironment environment;
68+
6669
private final boolean enableReloadFiltering;
6770

6871
public Fabric8EventBasedSecretsChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties,
6972
KubernetesClient kubernetesClient, ConfigurationUpdateStrategy strategy,
7073
Fabric8SecretsPropertySourceLocator fabric8SecretsPropertySourceLocator,
7174
KubernetesNamespaceProvider namespaceProvider) {
72-
super(environment, properties, strategy);
75+
super(strategy);
76+
this.environment = environment;
7377
this.kubernetesClient = kubernetesClient;
7478
this.fabric8SecretsPropertySourceLocator = fabric8SecretsPropertySourceLocator;
7579
this.enableReloadFiltering = properties.enableReloadFiltering();

0 commit comments

Comments
 (0)