Fix 1561 (#1563)

Fixes #1561

spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/catalog/KubernetesCatalogWatchAutoConfigurationApplicationContextTests.java

@@ -67,24 +67,23 @@ class KubernetesCatalogWatchAutoConfigurationApplicationContextTests {
 		applicationContextRunner.run(context -> assertThat(context).hasSingleBean(KubernetesCatalogWatch.class));
 	}
 
-	// disabling discovery has no impact on the catalog watch.
+	// disabling discovery, disables catalog watcher.
 	@Test
 	void kubernetesDiscoveryDisabled() {
 		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
 				"spring.cloud.kubernetes.discovery.enabled=false");
-		applicationContextRunner.run(context -> assertThat(context).hasSingleBean(KubernetesCatalogWatch.class));
+		applicationContextRunner.run(context -> assertThat(context).doesNotHaveBean(KubernetesCatalogWatch.class));
 	}
 
 	/**
-	 * both blocking and reactive configs are disabled, should not influence catalog
-	 * watcher in any way.
+	 * both blocking and reactive configs are disabled, catalog watcher is disabled also.
 	 */
 	@Test
 	void disableBlockingAndReactive() {
 		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
 				"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=false");
 		applicationContextRunner.run(context -> {
-			assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
+			assertThat(context).doesNotHaveBean(KubernetesCatalogWatch.class);
 			assertThat(context).doesNotHaveBean(KubernetesInformerReactiveDiscoveryClient.class);
 			assertThat(context).doesNotHaveBean(KubernetesInformerDiscoveryClient.class);
 			assertThat(context).doesNotHaveBean(SharedInformerFactory.class);
@@ -94,15 +93,38 @@ class KubernetesCatalogWatchAutoConfigurationApplicationContextTests {
 	}
 
 	/**
-	 * spring.cloud.kubernetes.discovery.enabled is false, but does not influence catalog
-	 * watcher.
+	 * blocking is disabled, reactive is enabled, catalog watcher is enabled.
+	 */
+	@Test
+	void disableBlockingEnableReactive() {
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
+			"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=true");
+		applicationContextRunner.run(context -> {
+			assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
+		});
+	}
+
+	/**
+	 * blocking is enabled, reactive is disabled, catalog watcher is enabled.
+	 */
+	@Test
+	void enableBlockingDisableReactive() {
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
+			"spring.cloud.discovery.blocking.enabled=true", "spring.cloud.discovery.reactive.enabled=false");
+		applicationContextRunner.run(context -> {
+			assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
+		});
+	}
+
+	/**
+	 * spring.cloud.kubernetes.discovery.enabled is false, catalog watcher is disabled also.
 	 */
 	@Test
 	void disableKubernetesDiscovery() {
 		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
 				"spring.cloud.kubernetes.discovery.enabled=false");
 		applicationContextRunner.run(context -> {
-			assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
+			assertThat(context).doesNotHaveBean(KubernetesCatalogWatch.class);
 			assertThat(context).doesNotHaveBean(KubernetesInformerReactiveDiscoveryClient.class);
 			assertThat(context).doesNotHaveBean(KubernetesInformerDiscoveryClient.class);
 		});

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ConditionalOnKubernetesCatalogWatcherEnabled.java

@@ -37,6 +37,8 @@ import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
 @Documented
 @Inherited
 @ConditionalOnDiscoveryEnabled
+@ConditionalOnKubernetesDiscoveryEnabled
+@ConditionalOnBlockingOrReactiveDiscoveryEnabled
 @ConditionalOnKubernetesCatalogEnabled
 @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
 public @interface ConditionalOnKubernetesCatalogWatcherEnabled {

spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/KubernetesCatalogWatchAutoConfigurationTests.java

@@ -64,19 +64,20 @@ class KubernetesCatalogWatchAutoConfigurationTests {
 		applicationContextRunner.run(context -> assertThat(context).hasSingleBean(KubernetesCatalogWatch.class));
 	}
 
-	// disabling discovery has no impact on the catalog watch.
+	// disabling discovery, disabled catalog watcher.
 	@Test
 	void kubernetesDiscoveryDisabled() {
 		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
 				"spring.cloud.kubernetes.discovery.enabled=false",
 				"spring.cloud.kubernetes.discovery.discovery-server-url=example.com",
+				"spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true",
+				"spring.cloud.kubernetes.discovery.discovery-server-url=example.com",
 				"spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true");
-		applicationContextRunner.run(context -> assertThat(context).hasSingleBean(KubernetesCatalogWatch.class));
+		applicationContextRunner.run(context -> assertThat(context).doesNotHaveBean(KubernetesCatalogWatch.class));
 	}
 
 	/**
-	 * both blocking and reactive configs are disabled, should not influence catalog
-	 * watcher in any way.
+	 * both blocking and reactive configs are disabled, catalog watcher is disabled.
 	 */
 	@Test
 	void disableBlockingAndReactive() {
@@ -84,15 +85,42 @@ class KubernetesCatalogWatchAutoConfigurationTests {
 				"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=false",
 				"spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true");
 		applicationContextRunner.run(context -> {
-			assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
+			assertThat(context).doesNotHaveBean(KubernetesCatalogWatch.class);
 			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClient.class);
 			assertThat(context).doesNotHaveBean(KubernetesReactiveDiscoveryClient.class);
 		});
 	}
 
 	/**
-	 * spring.cloud.kubernetes.discovery.enabled is false, but does not influence catalog
-	 * watcher.
+	 * blocking is disabled, reactive is enabled, catalog watcher is enabled.
+	 */
+	@Test
+	void disableBlockingEnableReactive() {
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
+			"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=true",
+			"spring.cloud.kubernetes.discovery.discovery-server-url=example.com",
+			"spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true");
+		applicationContextRunner.run(context -> {
+			assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
+		});
+	}
+
+	/**
+	 * blocking is enabled, reactive is disabled, catalog watcher is enabled.
+	 */
+	@Test
+	void enableBlockingDisableReactive() {
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
+			"spring.cloud.discovery.blocking.enabled=true", "spring.cloud.discovery.reactive.enabled=false",
+			"spring.cloud.kubernetes.discovery.discovery-server-url=example.com",
+			"spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true");
+		applicationContextRunner.run(context -> {
+			assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
+		});
+	}
+
+	/**
+	 * spring.cloud.kubernetes.discovery.enabled is false, catalog watcher is disabled.
 	 */
 	@Test
 	void disableKubernetesDiscovery() {
@@ -100,7 +128,7 @@ class KubernetesCatalogWatchAutoConfigurationTests {
 				"spring.cloud.kubernetes.discovery.enabled=false",
 				"spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true");
 		applicationContextRunner.run(context -> {
-			assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
+			assertThat(context).doesNotHaveBean(KubernetesCatalogWatch.class);
 			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClient.class);
 			assertThat(context).doesNotHaveBean(KubernetesReactiveDiscoveryClient.class);
 		});

spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesCatalogWatchAutoConfigurationApplicationContextTests.java

@@ -61,22 +61,36 @@ class KubernetesCatalogWatchAutoConfigurationApplicationContextTests {
 		applicationContextRunner.run(context -> assertThat(context).hasSingleBean(KubernetesCatalogWatch.class));
 	}
 
-	// disabling discovery has no impact on the catalog watch.
+	// disabling discovery should disable catalog watcher.
 	@Test
 	void kubernetesDiscoveryDisabled() {
 		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
 				"spring.cloud.kubernetes.discovery.enabled=false");
-		applicationContextRunner.run(context -> assertThat(context).hasSingleBean(KubernetesCatalogWatch.class));
+		applicationContextRunner.run(context -> assertThat(context).doesNotHaveBean(KubernetesCatalogWatch.class));
 	}
 
 	/**
-	 * both blocking and reactive configs are disabled, should not influence catalog
-	 * watcher in any way.
+	 * both blocking and reactive configs are disabled, catalog watcher is disabled too.
 	 */
 	@Test
 	void disableBlockingAndReactive() {
 		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
 				"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=false");
+		applicationContextRunner.run(context -> {
+			assertThat(context).doesNotHaveBean(KubernetesCatalogWatch.class);
+			assertThat(context).doesNotHaveBean(KubernetesClientServicesFunction.class);
+			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClient.class);
+			assertThat(context).doesNotHaveBean(KubernetesReactiveDiscoveryClient.class);
+		});
+	}
+
+	/**
+	 * blocking is disabled, reactive is enabled, catalog watcher is enabled.
+	 */
+	@Test
+	void disableBlockingEnableReactive() {
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
+			"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=true");
 		applicationContextRunner.run(context -> {
 			assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
 			assertThat(context).doesNotHaveBean(KubernetesClientServicesFunction.class);
@@ -86,15 +100,29 @@ class KubernetesCatalogWatchAutoConfigurationApplicationContextTests {
 	}
 
 	/**
-	 * spring.cloud.kubernetes.discovery.enabled is false, but does not influence catalog
-	 * watcher.
+	 * blocking is enabled, reactive is disabled, catalog watcher is enabled.
+	 */
+	@Test
+	void enableBlockingDisableReactive() {
+		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
+			"spring.cloud.discovery.blocking.enabled=true", "spring.cloud.discovery.reactive.enabled=false");
+		applicationContextRunner.run(context -> {
+			assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
+			assertThat(context).doesNotHaveBean(KubernetesClientServicesFunction.class);
+			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClient.class);
+			assertThat(context).doesNotHaveBean(KubernetesReactiveDiscoveryClient.class);
+		});
+	}
+
+	/**
+	 * spring.cloud.kubernetes.discovery.enabled is false, catalog watcher is disabled also.
 	 */
 	@Test
 	void disableKubernetesDiscovery() {
 		setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
 				"spring.cloud.kubernetes.discovery.enabled=false");
 		applicationContextRunner.run(context -> {
-			assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
+			assertThat(context).doesNotHaveBean(KubernetesCatalogWatch.class);
 			assertThat(context).doesNotHaveBean(KubernetesClientServicesFunction.class);
 			assertThat(context).doesNotHaveBean(KubernetesDiscoveryClient.class);
 			assertThat(context).doesNotHaveBean(KubernetesReactiveDiscoveryClient.class);