From ef62653671123a8c3ebf7fe069ddab663d68adc5 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Thu, 5 Nov 2020 11:48:47 +0100
Subject: [PATCH] Changed the impl due to the composites

---
 .../StubRunnerSpringCloudAutoConfiguration.java |  7 ++++---
 ...application-cloudtest-reactive-no-ribbon.yml | 17 -----------------
 2 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 spring-cloud-contract-stub-runner/src/test/resources/application-cloudtest-reactive-no-ribbon.yml

diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfiguration.java
index 9cba4ad152..99d049f131 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfiguration.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfiguration.java
@@ -20,7 +20,6 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
@@ -28,6 +27,8 @@ import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
 import org.springframework.cloud.contract.stubrunner.StubFinder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.core.env.Environment;
 
 /**
@@ -49,18 +50,18 @@ public class StubRunnerSpringCloudAutoConfiguration {
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(DiscoveryClient.class)
 	@ConditionalOnStubbedDiscoveryEnabled
 	@ConditionalOnProperty(value = "stubrunner.cloud.delegate.enabled", havingValue = "false", matchIfMissing = true)
+	@Order(Ordered.HIGHEST_PRECEDENCE)
 	public DiscoveryClient noOpStubRunnerDiscoveryClient(StubFinder stubFinder,
 			StubMapperProperties stubMapperProperties) {
 		return new StubRunnerDiscoveryClient(stubFinder, stubMapperProperties);
 	}
 
 	@Bean
-	@ConditionalOnMissingBean(ReactiveDiscoveryClient.class)
 	@ConditionalOnStubbedDiscoveryEnabled
 	@ConditionalOnProperty(value = "stubrunner.cloud.delegate.enabled", havingValue = "false", matchIfMissing = true)
+	@Order(Ordered.HIGHEST_PRECEDENCE)
 	public ReactiveDiscoveryClient noOpStubRunnerReactiveDiscoveryClient(StubFinder stubFinder,
 			StubMapperProperties stubMapperProperties) {
 		return new StubRunnerReactiveDiscoveryClient(stubFinder, stubMapperProperties);
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/application-cloudtest-reactive-no-ribbon.yml b/spring-cloud-contract-stub-runner/src/test/resources/application-cloudtest-reactive-no-ribbon.yml
deleted file mode 100644
index ab511e383a..0000000000
--- a/spring-cloud-contract-stub-runner/src/test/resources/application-cloudtest-reactive-no-ribbon.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-stubrunner:
-  cloud.stubbed.discovery.enabled: true
-spring.cloud:
-  zookeeper:
-    enabled: false
-    discovery.enabled: false
-  consul:
-    enabled: false
-    discovery.enabled: false
-  service-registry.enabled: false
-eureka.client.enabled: false
-ribbon.eureka.enabled: false
-spring:
-  cloud:
-    loadbalancer:
-      ribbon:
-        enabled: false # Use Reactive Load Balancer