create NoopDiscoveryClient if there is not a DiscoveryClient bean via auto config rather than import selector.

The import selector does not take into account @Conditional* annotations on the imported configurations.

fixes gh-g again

src/main/java/org/springframework/cloud/client/discovery/NoopDiscoveryClientAutoConfiguration.java

@@ -24,6 +24,7 @@ import javax.annotation.PostConstruct;
 import lombok.extern.apachecommons.CommonsLog;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.context.embedded.EmbeddedServletContainer;
 import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext;
@@ -41,8 +42,9 @@ import org.springframework.core.env.Environment;
  */
 @Configuration
 @EnableConfigurationProperties
+@ConditionalOnMissingBean(DiscoveryClient.class)
 @CommonsLog
-public class NoopDiscoveryClientConfiguration implements
+public class NoopDiscoveryClientAutoConfiguration implements
 		ApplicationListener<ContextRefreshedEvent> {
 
 	@Autowired(required = false)

src/main/java/org/springframework/cloud/client/discovery/NoopDiscoveryClientImportSelector.java

@@ -1,46 +0,0 @@
-/*
- * Copyright 2013-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.client.discovery;
-
-import lombok.extern.apachecommons.CommonsLog;
-
-import org.springframework.context.annotation.DeferredImportSelector;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.type.AnnotationMetadata;
-
-/**
- * Import Selector that only returns a NoopDiscoveryClientConfiguration if the
- * @EnableDiscoveryClient annotation has NOT been used.
- * @author Spencer Gibb
- */
-@CommonsLog
-public class NoopDiscoveryClientImportSelector implements
-		DeferredImportSelector {
-
-	@Override
-	public String[] selectImports(AnnotationMetadata metadata) {
-		AnnotationAttributes attributes = AnnotationAttributes.fromMap(metadata
-				.getAnnotationAttributes(EnableDiscoveryClient.class.getName(), true));
-
-		if (attributes == null) {
-			// @EnableDiscoveryClient has not been used, so configure the noop client
-			return new String[] { NoopDiscoveryClientConfiguration.class.getName() };
-		}
-
-		return new String[]{};
-	}
-}

src/main/resources/META-INF/spring.factories

@@ -1,4 +1,4 @@
 # Bootstrap Configuration
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.client.CommonsClientAutoConfiguration,\
-org.springframework.cloud.client.discovery.NoopDiscoveryClientImportSelector
+org.springframework.cloud.client.discovery.NoopDiscoveryClientAutoConfiguration

src/test/java/org/springframework/cloud/client/discovery/NoopDiscoveryClientConfigurationAdditionalTests.java

@@ -0,0 +1,73 @@
+package org.springframework.cloud.client.discovery;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.List;
+
+/**
+ * Tests if @EnableDiscoveryClient is NOT used, then NoopDiscoveryClient is created.
+ * @author Spencer Gibb
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = NoopDiscoveryClientConfigurationAdditionalTests.App.class)
+public class NoopDiscoveryClientConfigurationAdditionalTests {
+
+	@Autowired
+	DiscoveryClient discoveryClient;
+
+	@Test
+	public void testDiscoveryClientIsNotNoop() {
+		assertFalse("discoveryClient is wrong instance type", discoveryClient instanceof NoopDiscoveryClient);
+	}
+
+	@EnableAutoConfiguration
+	@Configuration
+	public static class App {
+
+		@Bean
+		public DiscoveryClient discoveryClient() {
+			return new DiscoveryClient() {
+				@Override
+				public String description() {
+					return null;
+				}
+
+				@Override
+				public ServiceInstance getLocalServiceInstance() {
+					return null;
+				}
+
+				@Override
+				public List<ServiceInstance> getInstances(String serviceId) {
+					return null;
+				}
+
+				@Override
+				public List<ServiceInstance> getAllInstances() {
+					return null;
+				}
+
+				@Override
+				public List<String> getServices() {
+					return null;
+				}
+			};
+		}
+
+		public static void main(String[] args) {
+			SpringApplication.run(App.class, args);
+		}
+	}
+}

src/test/java/org/springframework/cloud/client/discovery/NoopDiscoveryClientConfigurationTests.java

@@ -16,8 +16,8 @@ import static org.junit.Assert.*;
  * @author Spencer Gibb
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = NoopDiscoveryClientImportSelectorTests.App.class)
-public class NoopDiscoveryClientImportSelectorTests {
+@SpringApplicationConfiguration(classes = NoopDiscoveryClientConfigurationTests.App.class)
+public class NoopDiscoveryClientConfigurationTests {
 
 	@Autowired
 	DiscoveryClient discoveryClient;