Merge pull request spring-cloud#2163 from wind57/minor-cleanup-before-fix-issue-2148

minor cleanup before fixing 2148

Author: ryanjbaxter

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

@@ -178,7 +178,7 @@ static boolean changed(List<? extends MapPropertySource> k8sSources, List<? exte
 				LOG.debug("k8s property sources size: " + k8sSources.size());
 				k8sSources.forEach(item -> LOG.debug(item.toString()));
 
-				LOG.debug("app property sources size size: " + appSources.size());
+				LOG.debug("app property sources size: " + appSources.size());
 				appSources.forEach(item -> LOG.debug(item.toString()));
 			}
 			LOG.warn(() -> "The current number of PropertySources does not match "

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

@@ -47,14 +47,15 @@ public class PollingConfigMapChangeDetector extends ConfigurationChangeDetector
 
 	private final long period;
 
-	// this beans has already a Conditional on this property, we only have it here
+	// this bean already has a Conditional on this property, we only have it here
 	// in case it is created manually.
 	private final boolean monitorConfigMaps;
 
-	public PollingConfigMapChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties,
-			ConfigurationUpdateStrategy strategy, Class<? extends MapPropertySource> propertySourceClass,
-			PropertySourceLocator propertySourceLocator, TaskScheduler taskExecutor) {
-		super(environment, properties, strategy);
+	public PollingConfigMapChangeDetector(AbstractEnvironment environment,
+			ConfigReloadProperties configReloadProperties, ConfigurationUpdateStrategy strategy,
+			Class<? extends MapPropertySource> propertySourceClass, PropertySourceLocator propertySourceLocator,
+			TaskScheduler taskExecutor) {
+		super(environment, configReloadProperties, strategy);
 		this.propertySourceLocator = propertySourceLocator;
 		this.propertySourceClass = propertySourceClass;
 		this.taskExecutor = taskExecutor;

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

@@ -51,10 +51,10 @@ public class PollingSecretsChangeDetector extends ConfigurationChangeDetector {
 	// in case it is created manually.
 	private final boolean monitorSecrets;
 
-	public PollingSecretsChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties,
+	public PollingSecretsChangeDetector(AbstractEnvironment environment, ConfigReloadProperties configReloadProperties,
 			ConfigurationUpdateStrategy strategy, Class<? extends MapPropertySource> propertySourceClass,
 			PropertySourceLocator propertySourceLocator, TaskScheduler taskExecutor) {
-		super(environment, properties, strategy);
+		super(environment, configReloadProperties, strategy);
 		this.propertySourceLocator = propertySourceLocator;
 		this.propertySourceClass = propertySourceClass;
 		this.taskExecutor = taskExecutor;

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

@@ -71,7 +71,7 @@ public class Fabric8ConfigReloadAutoConfiguration {
 
 	/**
 	 * Polling configMap ConfigurationChangeDetector.
-	 * @param properties config reload properties
+	 * @param configReloadProperties config reload properties
 	 * @param strategy configuration update strategy
 	 * @param fabric8ConfigMapPropertySourceLocator configMap property source locator
 	 * @return a bean that listen to configuration changes and fire a reload.
@@ -80,19 +80,19 @@ public class Fabric8ConfigReloadAutoConfiguration {
 	@ConditionalOnConfigMapsReloadEnabled
 	@ConditionalOnBean(Fabric8ConfigMapPropertySourceLocator.class)
 	@Conditional(PollingReloadDetectionMode.class)
-	public ConfigurationChangeDetector configMapPropertyChangePollingWatcher(ConfigReloadProperties properties,
-			ConfigurationUpdateStrategy strategy,
+	public ConfigurationChangeDetector configMapPropertyChangePollingWatcher(
+			ConfigReloadProperties configReloadProperties, ConfigurationUpdateStrategy strategy,
 			Fabric8ConfigMapPropertySourceLocator fabric8ConfigMapPropertySourceLocator,
 			TaskSchedulerWrapper<TaskScheduler> taskSchedulerWrapper, AbstractEnvironment environment) {
 
-		return new PollingConfigMapChangeDetector(environment, properties, strategy,
+		return new PollingConfigMapChangeDetector(environment, configReloadProperties, strategy,
 				Fabric8ConfigMapPropertySource.class, fabric8ConfigMapPropertySourceLocator,
 				taskSchedulerWrapper.getTaskScheduler());
 	}
 
 	/**
 	 * Polling secrets ConfigurationChangeDetector.
-	 * @param properties config reload properties
+	 * @param configReloadProperties config reload properties
 	 * @param strategy configuration update strategy
 	 * @param fabric8SecretsPropertySourceLocator secrets property source locator
 	 * @return a bean that listen to configuration changes and fire a reload.
@@ -101,18 +101,19 @@ public ConfigurationChangeDetector configMapPropertyChangePollingWatcher(ConfigR
 	@ConditionalOnSecretsReloadEnabled
 	@ConditionalOnBean(Fabric8SecretsPropertySourceLocator.class)
 	@Conditional(PollingReloadDetectionMode.class)
-	public ConfigurationChangeDetector secretsPropertyChangePollingWatcher(ConfigReloadProperties properties,
-			ConfigurationUpdateStrategy strategy,
+	public ConfigurationChangeDetector secretsPropertyChangePollingWatcher(
+			ConfigReloadProperties configReloadProperties, ConfigurationUpdateStrategy strategy,
 			Fabric8SecretsPropertySourceLocator fabric8SecretsPropertySourceLocator,
 			TaskSchedulerWrapper<TaskScheduler> taskScheduler, AbstractEnvironment environment) {
 
-		return new PollingSecretsChangeDetector(environment, properties, strategy, Fabric8SecretsPropertySource.class,
-				fabric8SecretsPropertySourceLocator, taskScheduler.getTaskScheduler());
+		return new PollingSecretsChangeDetector(environment, configReloadProperties, strategy,
+				Fabric8SecretsPropertySource.class, fabric8SecretsPropertySourceLocator,
+				taskScheduler.getTaskScheduler());
 	}
 
 	/**
 	 * Event Based configMap ConfigurationChangeDetector.
-	 * @param properties config reload properties
+	 * @param configReloadProperties config reload properties
 	 * @param strategy configuration update strategy
 	 * @param fabric8ConfigMapPropertySourceLocator configMap property source locator
 	 * @return a bean that listen to configMap change events and fire a reload.
@@ -121,18 +122,18 @@ public ConfigurationChangeDetector secretsPropertyChangePollingWatcher(ConfigRel
 	@ConditionalOnConfigMapsReloadEnabled
 	@ConditionalOnBean(Fabric8ConfigMapPropertySourceLocator.class)
 	@Conditional(EventReloadDetectionMode.class)
-	public ConfigurationChangeDetector configMapPropertyChangeEventWatcher(ConfigReloadProperties properties,
-			ConfigurationUpdateStrategy strategy,
+	public ConfigurationChangeDetector configMapPropertyChangeEventWatcher(
+			ConfigReloadProperties configReloadProperties, ConfigurationUpdateStrategy strategy,
 			Fabric8ConfigMapPropertySourceLocator fabric8ConfigMapPropertySourceLocator,
 			AbstractEnvironment environment, KubernetesClient kubernetesClient) {
 
-		return new Fabric8EventBasedConfigMapChangeDetector(environment, properties, kubernetesClient, strategy,
-				fabric8ConfigMapPropertySourceLocator, new KubernetesNamespaceProvider(environment));
+		return new Fabric8EventBasedConfigMapChangeDetector(environment, configReloadProperties, kubernetesClient,
+				strategy, fabric8ConfigMapPropertySourceLocator, new KubernetesNamespaceProvider(environment));
 	}
 
 	/**
 	 * Event Based secrets ConfigurationChangeDetector.
-	 * @param properties config reload properties
+	 * @param configReloadProperties config reload properties
 	 * @param strategy configuration update strategy
 	 * @param fabric8SecretsPropertySourceLocator secrets property source locator
 	 * @return a bean that listen to secrets change events and fire a reload.
@@ -141,13 +142,13 @@ public ConfigurationChangeDetector configMapPropertyChangeEventWatcher(ConfigRel
 	@ConditionalOnSecretsReloadEnabled
 	@ConditionalOnBean(Fabric8SecretsPropertySourceLocator.class)
 	@Conditional(EventReloadDetectionMode.class)
-	public ConfigurationChangeDetector secretsPropertyChangeEventWatcher(ConfigReloadProperties properties,
+	public ConfigurationChangeDetector secretsPropertyChangeEventWatcher(ConfigReloadProperties configReloadProperties,
 			ConfigurationUpdateStrategy strategy,
 			Fabric8SecretsPropertySourceLocator fabric8SecretsPropertySourceLocator, AbstractEnvironment environment,
 			KubernetesClient kubernetesClient) {
 
-		return new Fabric8EventBasedSecretsChangeDetector(environment, properties, kubernetesClient, strategy,
-				fabric8SecretsPropertySourceLocator, new KubernetesNamespaceProvider(environment));
+		return new Fabric8EventBasedSecretsChangeDetector(environment, configReloadProperties, kubernetesClient,
+				strategy, fabric8SecretsPropertySourceLocator, new KubernetesNamespaceProvider(environment));
 	}
 
 }