Merge pull request #1964 from wind57/fix-1963

fix 1963: order for discovery clients

Author: ryanjbaxter

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

@@ -73,4 +73,9 @@ public Flux<String> getServices() {
 			.subscribeOn(Schedulers.boundedElastic());
 	}
 
+	@Override
+	public int getOrder() {
+		return kubernetesDiscoveryClient.getOrder();
+	}
+
 }

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

@@ -617,6 +617,20 @@ void testPodMetadata() {
 		server.shutdown();
 	}
 
+	@Test
+	void testOrder() {
+		KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of("a", "b"),
+				true, 60L, false, "", Set.of(), Map.of(), "", null, 57, false, true);
+
+		Lister<V1Service> serviceLister = setupServiceLister(SERVICE_1, SERVICE_2);
+		Lister<V1Endpoints> endpointsLister = setupEndpointsLister(ENDPOINTS_1);
+
+		KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(
+				SHARED_INFORMER_FACTORY, serviceLister, endpointsLister, null, null, properties);
+
+		assertThat(discoveryClient.getOrder()).isEqualTo(57);
+	}
+
 	private Lister<V1Service> setupServiceLister(V1Service... services) {
 		Cache<V1Service> serviceCache = new Cache<>();
 		Lister<V1Service> serviceLister = new Lister<>(serviceCache);

spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientTests.java

@@ -86,7 +86,7 @@ void afterEach() {
 	void testDiscoveryGetServicesAllNamespaceShouldWork() {
 		Lister<V1Service> serviceLister = setupServiceLister(NAMESPACE_ALL, TEST_SERVICE_1, TEST_SERVICE_2,
 				TEST_SERVICE_3);
-		Lister<V1Endpoints> endpointsLister = setupEndpointsLister("");
+		Lister<V1Endpoints> endpointsLister = setupEndpointsLister();
 
 		KubernetesDiscoveryProperties kubernetesDiscoveryProperties = new KubernetesDiscoveryProperties(true, true,
 				Set.of(), true, 60, false, null, Set.of(), Map.of(), null, null, 0, false);
@@ -105,7 +105,7 @@ void testDiscoveryGetServicesAllNamespaceShouldWork() {
 	@Test
 	void testDiscoveryGetServicesOneNamespaceShouldWork() {
 		Lister<V1Service> serviceLister = setupServiceLister(NAMESPACE_1, TEST_SERVICE_1, TEST_SERVICE_2);
-		Lister<V1Endpoints> endpointsLister = setupEndpointsLister("");
+		Lister<V1Endpoints> endpointsLister = setupEndpointsLister();
 
 		KubernetesInformerReactiveDiscoveryClient discoveryClient = new KubernetesInformerReactiveDiscoveryClient(
 				new KubernetesInformerDiscoveryClient(sharedInformerFactory, serviceLister, endpointsLister, null, null,
@@ -121,7 +121,7 @@ void testDiscoveryGetServicesOneNamespaceShouldWork() {
 	@Test
 	void testDiscoveryGetInstanceAllNamespaceShouldWork() {
 		Lister<V1Service> serviceLister = setupServiceLister(NAMESPACE_ALL, TEST_SERVICE_1, TEST_SERVICE_2);
-		Lister<V1Endpoints> endpointsLister = setupEndpointsLister(NAMESPACE_1, TEST_ENDPOINTS_1);
+		Lister<V1Endpoints> endpointsLister = setupEndpointsLister(TEST_ENDPOINTS_1);
 
 		KubernetesDiscoveryProperties kubernetesDiscoveryProperties = new KubernetesDiscoveryProperties(true, true,
 				Set.of(), true, 60, false, null, Set.of(), Map.of(), null,
@@ -143,7 +143,7 @@ void testDiscoveryGetInstanceAllNamespaceShouldWork() {
 	@Test
 	void testDiscoveryGetInstanceOneNamespaceShouldWork() {
 		Lister<V1Service> serviceLister = setupServiceLister(NAMESPACE_1, TEST_SERVICE_1, TEST_SERVICE_2);
-		Lister<V1Endpoints> endpointsLister = setupEndpointsLister(NAMESPACE_1, TEST_ENDPOINTS_1);
+		Lister<V1Endpoints> endpointsLister = setupEndpointsLister(TEST_ENDPOINTS_1);
 
 		KubernetesDiscoveryProperties kubernetesDiscoveryProperties = new KubernetesDiscoveryProperties(true, false,
 				Set.of(), true, 60, false, null, Set.of(), Map.of(), null,
@@ -173,7 +173,7 @@ void testDiscoveryGetInstanceOneNamespaceShouldWork() {
 	 */
 	@Test
 	void testAllNamespacesTwoServicesPresent() {
-		Lister<V1Endpoints> endpointsLister = setupEndpointsLister("");
+		Lister<V1Endpoints> endpointsLister = setupEndpointsLister();
 
 		boolean allNamespaces = true;
 		V1Service serviceA = new V1Service().metadata(new V1ObjectMeta().name("service-a").namespace("namespace-a"));
@@ -207,7 +207,7 @@ void testAllNamespacesTwoServicesPresent() {
 	 */
 	@Test
 	void testSingleNamespaceTwoServicesPresent() {
-		Lister<V1Endpoints> endpointsLister = setupEndpointsLister("");
+		Lister<V1Endpoints> endpointsLister = setupEndpointsLister();
 
 		boolean allNamespaces = false;
 		V1Service serviceA = new V1Service().metadata(new V1ObjectMeta().name("service-a").namespace("namespace-a"));
@@ -330,6 +330,20 @@ void testAllSingleTwoEndpointsPresent() {
 		Assertions.assertThat(byIp).contains("1.1.1.1");
 	}
 
+	@Test
+	void testOrder() {
+		KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of("a", "b"),
+				true, 60L, false, "", Set.of(), Map.of(), "", null, 57, false, true);
+
+		Lister<V1Service> serviceLister = setupServiceLister(NAMESPACE_ALL, TEST_SERVICE_1, TEST_SERVICE_2);
+		Lister<V1Endpoints> endpointsLister = setupEndpointsLister(TEST_ENDPOINTS_1);
+
+		KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(sharedInformerFactory,
+				serviceLister, endpointsLister, null, null, properties);
+
+		Assertions.assertThat(discoveryClient.getOrder()).isEqualTo(57);
+	}
+
 	private Lister<V1Service> setupServiceLister(String namespace, V1Service... services) {
 		Lister<V1Service> serviceLister = new Lister<>(serviceCache, namespace);
 		for (V1Service svc : services) {
@@ -338,7 +352,7 @@ private Lister<V1Service> setupServiceLister(String namespace, V1Service... serv
 		return serviceLister;
 	}
 
-	private Lister<V1Endpoints> setupEndpointsLister(String namespace, V1Endpoints... endpoints) {
+	private Lister<V1Endpoints> setupEndpointsLister(V1Endpoints... endpoints) {
 		Lister<V1Endpoints> endpointsLister = new Lister<>(endpointsCache);
 		for (V1Endpoints ep : endpoints) {
 			endpointsCache.add(ep);

spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/reactive/KubernetesReactiveDiscoveryClient.java

@@ -61,4 +61,9 @@ public Flux<String> getServices() {
 			.subscribeOn(Schedulers.boundedElastic());
 	}
 
+	@Override
+	public int getOrder() {
+		return kubernetesDiscoveryClient.getOrder();
+	}
+
 }

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

@@ -613,6 +613,16 @@ void testPodMetadata() {
 			.containsExactlyInAnyOrderEntriesOf(Map.of("c", "d"));
 	}
 
+	@Test
+	void testOrder() {
+		KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60L,
+				false, "", Set.of(), Map.of(), "", null, 57, false);
+
+		KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(client, properties, null, null, null);
+
+		Assertions.assertThat(discoveryClient.getOrder()).isEqualTo(57);
+	}
+
 	private void createEndpoints(String namespace, String name, Map<String, String> labels) {
 		client.endpoints()
 			.inNamespace(namespace)