From 9f7a8f95a455f4a08cfcbb1f9c48a001ed6b43f3 Mon Sep 17 00:00:00 2001 From: Zoran Regvart Date: Thu, 31 Jan 2019 18:41:06 +0100 Subject: [PATCH] Add @ConditionalOnMissingBean (#467) In Apache Camel we had some tests fail when upgrading to Spring Boot 2.1 we narrowed it down to missing `@ConditionalOnMissingBean`. I guess the processing order for auto-configurations changed between Spring Boot 2.0 and 2.1 and this issue surfaced. The tests that failed are here: https://github.com/apache/camel/tree/master/components/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul --- .../consul/discovery/ConsulDiscoveryClientConfiguration.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java index 8f9e77ed..09abaf26 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java @@ -59,12 +59,14 @@ public class ConsulDiscoveryClientConfiguration { } @Bean + @ConditionalOnMissingBean //TODO: move to service-registry for Edgware public HeartbeatProperties heartbeatProperties() { return new HeartbeatProperties(); } @Bean + @ConditionalOnMissingBean //TODO: Split appropriate values to service-registry for Edgware @ConditionalOnMissingBean public ConsulDiscoveryProperties consulDiscoveryProperties(InetUtils inetUtils) {