fix (#1882)

wind57 · web-flow · commit bb81e3f44bb4 · 2025-02-25T13:54:56.000-05:00
Signed-off-by: wind57 &lt;eugen.rabii@gmail.com&gt;
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusKafkaAutoConfiguration.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusKafkaAutoConfiguration.java
@@ -49,7 +49,7 @@
 class BusKafkaAutoConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean(ConfigMapWatcherChangeDetector.class)
+	@ConditionalOnMissingBean
 	@ConditionalOnBean(KubernetesClientConfigMapPropertySourceLocator.class)
 	ConfigMapWatcherChangeDetector busConfigMapChangeWatcher(AbstractEnvironment environment, CoreV1Api coreV1Api,
 			KubernetesClientConfigMapPropertySourceLocator configMapPropertySourceLocator,
@@ -63,7 +63,7 @@ ConfigMapWatcherChangeDetector busConfigMapChangeWatcher(AbstractEnvironment env
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(SecretsWatcherChangeDetector.class)
+	@ConditionalOnMissingBean
 	@ConditionalOnBean(KubernetesClientSecretsPropertySourceLocator.class)
 	SecretsWatcherChangeDetector busSecretsChangeWatcher(AbstractEnvironment environment, CoreV1Api coreV1Api,
 			KubernetesClientSecretsPropertySourceLocator secretsPropertySourceLocator,
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusRabbitAutoConfiguration.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusRabbitAutoConfiguration.java
@@ -50,7 +50,7 @@
 class BusRabbitAutoConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean(ConfigMapWatcherChangeDetector.class)
+	@ConditionalOnMissingBean
 	@ConditionalOnBean(KubernetesClientConfigMapPropertySourceLocator.class)
 	ConfigMapWatcherChangeDetector busConfigMapChangeWatcher(AbstractEnvironment environment, CoreV1Api coreV1Api,
 			KubernetesClientConfigMapPropertySourceLocator configMapPropertySourceLocator,
@@ -64,7 +64,7 @@ ConfigMapWatcherChangeDetector busConfigMapChangeWatcher(AbstractEnvironment env
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(SecretsWatcherChangeDetector.class)
+	@ConditionalOnMissingBean
 	@ConditionalOnBean(KubernetesClientSecretsPropertySourceLocator.class)
 	SecretsWatcherChangeDetector busSecretsChangeWatcher(AbstractEnvironment environment, CoreV1Api coreV1Api,
 			KubernetesClientSecretsPropertySourceLocator secretsPropertySourceLocator,
diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherAutoConfiguration.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherAutoConfiguration.java
@@ -56,7 +56,7 @@ public WebClient webClient(WebClient.Builder webClientBuilder) {
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(ConfigMapWatcherChangeDetector.class)
+	@ConditionalOnMissingBean
 	@ConditionalOnBean(KubernetesClientConfigMapPropertySourceLocator.class)
 	public ConfigMapWatcherChangeDetector httpBasedConfigMapWatchChangeDetector(AbstractEnvironment environment,
 			CoreV1Api coreV1Api, KubernetesClientConfigMapPropertySourceLocator configMapPropertySourceLocator,

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public WebClient webClient(WebClient.Builder webClientBuilder) {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Bean`
`59`		`- @ConditionalOnMissingBean(ConfigMapWatcherChangeDetector.class)`
	`59`	`+ @ConditionalOnMissingBean`
`60`	`60`	`@ConditionalOnBean(KubernetesClientConfigMapPropertySourceLocator.class)`
`61`	`61`	`public ConfigMapWatcherChangeDetector httpBasedConfigMapWatchChangeDetector(AbstractEnvironment environment,`
`62`	`62`	`CoreV1Api coreV1Api, KubernetesClientConfigMapPropertySourceLocator configMapPropertySourceLocator,`