From c6b4d6da9d8c424b2c1f83434061e673f468f37f Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 21 May 2015 15:52:43 +0100 Subject: [PATCH] Allow all discovery implementations to bubble up Hope that one is chosen by @Conditionals. The tests all pass but this could get hairy when we start to get more discovery implementations. --- .../cloud/util/SingleImplementationImportSelector.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/SingleImplementationImportSelector.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/util/SingleImplementationImportSelector.java index 84e8fdd2..22805d17 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/util/SingleImplementationImportSelector.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/util/SingleImplementationImportSelector.java @@ -17,7 +17,6 @@ package org.springframework.cloud.util; import java.util.ArrayList; -import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; @@ -77,11 +76,9 @@ public abstract class SingleImplementationImportSelector implements } if (factories.size() > 1) { - String factory = factories.get(0); - // there should only every be one DiscoveryClient + // there should only ever be one DiscoveryClient, but there might be more than one factory log.warn("More than one implementation " + "of @" + getSimpleName() - + ". Using " + factory + " out of available " + factories); - factories = Collections.singletonList(factory); + + " (now relying on @Conditionals to pick one): " + factories); } return factories.toArray(new String[factories.size()]);