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 d2af8fd0..8f9e77ed 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 @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 the original author or authors. + * Copyright 2013-2018 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. @@ -66,6 +66,7 @@ public class ConsulDiscoveryClientConfiguration { @Bean //TODO: Split appropriate values to service-registry for Edgware + @ConditionalOnMissingBean public ConsulDiscoveryProperties consulDiscoveryProperties(InetUtils inetUtils) { return new ConsulDiscoveryProperties(inetUtils); } diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java index d65b5a8e..9dff098c 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/configclient/ConsulDiscoveryClientConfigServiceBootstrapConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2016 the original author or authors. + * Copyright 2013-2018 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. @@ -16,16 +16,13 @@ package org.springframework.cloud.consul.discovery.configclient; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.cloud.commons.util.InetUtils; import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator; import org.springframework.cloud.consul.ConsulAutoConfiguration; import org.springframework.cloud.consul.discovery.ConsulDiscoveryClientConfiguration; -import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; /** * Helper for config client that wants to lookup the config server via discovery. @@ -35,14 +32,7 @@ import org.springframework.context.annotation.Import; @ConditionalOnClass(ConfigServicePropertySourceLocator.class) @ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false) @Configuration -@Import({ ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class}) +@ImportAutoConfiguration({ ConsulAutoConfiguration.class, ConsulDiscoveryClientConfiguration.class}) public class ConsulDiscoveryClientConfigServiceBootstrapConfiguration { - @Bean - public ConsulDiscoveryProperties consulDiscoveryProperties(InetUtils inetUtils) { - ConsulDiscoveryProperties properties = new ConsulDiscoveryProperties(inetUtils); - // for bootstrap, lifecycle (and hence registration) is not needed, just discovery client - properties.getLifecycle().setEnabled(false); - return properties; - } } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java index 5b3f9305..caf4138f 100644 --- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/DiscoveryClientConfigServiceAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2016 the original author or authors. + * Copyright 2013-2018 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. @@ -16,33 +16,24 @@ package org.springframework.cloud.consul.discovery.configclient; -import java.util.Arrays; - +import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory; import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.util.TestPropertyValues; -import org.springframework.cloud.client.DefaultServiceInstance; -import org.springframework.cloud.client.ServiceInstance; -import org.springframework.cloud.commons.util.UtilAutoConfiguration; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.config.client.ConfigClientProperties; -import org.springframework.cloud.config.client.DiscoveryClientConfigServiceBootstrapConfiguration; -import org.springframework.cloud.consul.ConsulAutoConfiguration; import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient; -import org.springframework.cloud.consul.discovery.ConsulDiscoveryClientConfiguration; -import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; import org.springframework.cloud.test.ClassPathExclusions; import org.springframework.cloud.test.ModifiedClassPathRunner; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.Bean; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; +import org.springframework.context.support.AbstractApplicationContext; import static org.junit.Assert.assertEquals; -import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.atLeast; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; /** @@ -52,13 +43,19 @@ import static org.mockito.Mockito.verify; @ClassPathExclusions({ "spring-retry-*.jar", "spring-boot-starter-aop-*.jar" }) public class DiscoveryClientConfigServiceAutoConfigurationTests { - private AnnotationConfigApplicationContext context; + private ConfigurableApplicationContext context; + + @Before + public void init() { + //FIXME: why do I need to do this? (fails in maven build without it. + TomcatURLStreamHandlerFactory.disable(); + } @After public void close() { if (this.context != null) { if (this.context.getParent() != null) { - ((AnnotationConfigApplicationContext) this.context.getParent()).close(); + ((AbstractApplicationContext) this.context.getParent()).close(); } this.context.close(); } @@ -66,10 +63,14 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests { @Test public void onWhenRequested() throws Exception { - setup("server.port=7000", "spring.cloud.config.discovery.enabled=true", + setup("server.port=0", "spring.cloud.config.discovery.enabled=true", + "logging.level.org.springframework.cloud.config.client=DEBUG", + "spring.cloud.consul.discovery.test.enabled:true", + "spring.application.name=discoveryclientconfigservicetest", "spring.cloud.consul.discovery.port:7001", "spring.cloud.consul.discovery.hostname:foo", "spring.cloud.config.discovery.service-id:configserver"); + assertEquals( 1, this.context .getBeanNamesForType(ConsulConfigServerAutoConfiguration.class).length); ConsulDiscoveryClient client = this.context.getParent().getBean( @@ -81,36 +82,13 @@ public class DiscoveryClientConfigServiceAutoConfigurationTests { } private void setup(String... env) { - AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext(); - TestPropertyValues.of(env).applyTo(parent); - parent.register(UtilAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class, EnvironmentKnobbler.class, - ConsulDiscoveryClientConfigServiceBootstrapConfiguration.class, - DiscoveryClientConfigServiceBootstrapConfiguration.class, - ConfigClientProperties.class); - parent.refresh(); - this.context = new AnnotationConfigApplicationContext(); - this.context.setParent(parent); - this.context.register(PropertyPlaceholderAutoConfiguration.class, - ConsulConfigServerAutoConfiguration.class, ConsulAutoConfiguration.class, - ConsulDiscoveryClientConfiguration.class); - this.context.refresh(); + this.context = new SpringApplicationBuilder(TestConfig.class) + .properties(env) + .run(); } @Configuration - protected static class EnvironmentKnobbler { - - @Bean - public ConsulDiscoveryClient consulDiscoveryClient( - ConsulDiscoveryProperties properties) { - ConsulDiscoveryClient client = mock(ConsulDiscoveryClient.class); - ServiceInstance instance = new DefaultServiceInstance("configserver", - properties.getHostname(), properties.getPort(), false); - given(client.getInstances("configserver")) - .willReturn(Arrays.asList(instance)); - return client; - } - - } + @EnableAutoConfiguration + protected static class TestConfig { } } diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java new file mode 100644 index 00000000..7b5540f1 --- /dev/null +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/configclient/TestConsulDiscoveryClientBootstrapConfiguration.java @@ -0,0 +1,46 @@ +/* + * Copyright 2013-2018 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.consul.discovery.configclient; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.cloud.client.DefaultServiceInstance; +import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.consul.discovery.ConsulDiscoveryClient; +import org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Arrays; + +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + +@ConditionalOnProperty(value = "spring.cloud.consul.discovery.test.enabled", matchIfMissing = false) +@Configuration +public class TestConsulDiscoveryClientBootstrapConfiguration { + + @Bean + public ConsulDiscoveryClient consulDiscoveryClient( + ConsulDiscoveryProperties properties) { + ConsulDiscoveryClient client = mock(ConsulDiscoveryClient.class); + ServiceInstance instance = new DefaultServiceInstance("configserver", + properties.getHostname(), properties.getPort(), false); + given(client.getInstances("configserver")) + .willReturn(Arrays.asList(instance)); + return client; + } +} diff --git a/spring-cloud-consul-discovery/src/test/resources/META-INF/spring.factories b/spring-cloud-consul-discovery/src/test/resources/META-INF/spring.factories new file mode 100644 index 00000000..a189ff09 --- /dev/null +++ b/spring-cloud-consul-discovery/src/test/resources/META-INF/spring.factories @@ -0,0 +1,3 @@ +org.springframework.cloud.bootstrap.BootstrapConfiguration=\ +org.springframework.cloud.consul.discovery.configclient.TestConsulDiscoveryClientBootstrapConfiguration +