Deprecate constructor that uses namespace

spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClient.java

@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.kubernetes.client.discovery.reactive;
 
+import java.util.Objects;
+
 import io.kubernetes.client.informer.SharedInformer;
 import io.kubernetes.client.informer.SharedInformerFactory;
 import io.kubernetes.client.informer.cache.Lister;
@@ -29,7 +31,6 @@
 import org.springframework.cloud.kubernetes.client.discovery.KubernetesInformerDiscoveryClient;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
-import org.springframework.util.Assert;
 
 /**
  * @author Ryan Baxter
@@ -38,6 +39,7 @@ public class KubernetesInformerReactiveDiscoveryClient implements ReactiveDiscov
 
 	private final KubernetesInformerDiscoveryClient kubernetesDiscoveryClient;
 
+	@Deprecated(forRemoval = true)
 	public KubernetesInformerReactiveDiscoveryClient(KubernetesNamespaceProvider kubernetesNamespaceProvider,
 			SharedInformerFactory sharedInformerFactory, Lister<V1Service> serviceLister,
 			Lister<V1Endpoints> endpointsLister, SharedInformer<V1Service> serviceInformer,
@@ -47,14 +49,23 @@ public KubernetesInformerReactiveDiscoveryClient(KubernetesNamespaceProvider kub
 				serviceInformer, endpointsInformer, properties);
 	}
 
+	KubernetesInformerReactiveDiscoveryClient(
+			SharedInformerFactory sharedInformerFactory, Lister<V1Service> serviceLister,
+			Lister<V1Endpoints> endpointsLister, SharedInformer<V1Service> serviceInformer,
+			SharedInformer<V1Endpoints> endpointsInformer, KubernetesDiscoveryProperties properties) {
+		this.kubernetesDiscoveryClient = new KubernetesInformerDiscoveryClient(
+			sharedInformerFactory, serviceLister, endpointsLister,
+			serviceInformer, endpointsInformer, properties);
+	}
+
 	@Override
 	public String description() {
 		return "Kubernetes Reactive Discovery Client";
 	}
 
 	@Override
 	public Flux<ServiceInstance> getInstances(String serviceId) {
-		Assert.notNull(serviceId, "[Assertion failed] - the object argument must not be null");
+		Objects.requireNonNull(serviceId, "serviceId must be provided");
 		return Flux.defer(() -> Flux.fromIterable(kubernetesDiscoveryClient.getInstances(serviceId)))
 				.subscribeOn(Schedulers.boundedElastic());
 	}

spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientAutoConfiguration.java

@@ -74,6 +74,7 @@ public ReactiveDiscoveryClientHealthIndicator kubernetesReactiveDiscoveryClientH
 		return healthIndicator;
 	}
 
+	@Deprecated(forRemoval = true)
 	@Bean
 	@ConditionalOnMissingBean
 	public KubernetesInformerReactiveDiscoveryClient kubernetesReactiveDiscoveryClient(
@@ -85,4 +86,15 @@ public KubernetesInformerReactiveDiscoveryClient kubernetesReactiveDiscoveryClie
 				serviceLister, endpointsLister, serviceInformer, endpointsInformer, properties);
 	}
 
+	@Bean
+	@ConditionalOnMissingBean
+	KubernetesInformerReactiveDiscoveryClient kubernetesClientReactiveDiscoveryClient(
+		SharedInformerFactory sharedInformerFactory,
+		Lister<V1Service> serviceLister, Lister<V1Endpoints> endpointsLister,
+		SharedInformer<V1Service> serviceInformer, SharedInformer<V1Endpoints> endpointsInformer,
+		KubernetesDiscoveryProperties properties) {
+		return new KubernetesInformerReactiveDiscoveryClient(sharedInformerFactory,
+			serviceLister, endpointsLister, serviceInformer, endpointsInformer, properties);
+	}
+
 }