Skip to content

S
spring-cloud-netflix
Commit d809ac99 by Spencer Gibb
Options

fix eureka-first test

parent 952be931
Showing with 2 additions and 1 deletion
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceBootstrapConfiguration.java
...@@ -26,6 +26,7 @@ import org.springframework.cloud.client.discovery.DiscoveryClient; ...@@ -26,6 +26,7 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.config.client.ConfigClientProperties; import org.springframework.cloud.config.client.ConfigClientProperties;
import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator; import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration; import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration;
import org.springframework.cloud.util.UtilAutoConfiguration;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.context.event.ContextRefreshedEvent;
...@@ -45,7 +46,7 @@ import lombok.extern.apachecommons.CommonsLog; ...@@ -45,7 +46,7 @@ import lombok.extern.apachecommons.CommonsLog;
@ConditionalOnClass({ EurekaClient.class, ConfigServicePropertySourceLocator.class }) @ConditionalOnClass({ EurekaClient.class, ConfigServicePropertySourceLocator.class })
@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false) @ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false)
@Configuration @Configuration
@Import(EurekaClientAutoConfiguration.class) @Import({ UtilAutoConfiguration.class, EurekaClientAutoConfiguration.class })
@CommonsLog @CommonsLog
public class DiscoveryClientConfigServiceBootstrapConfiguration { public class DiscoveryClientConfigServiceBootstrapConfiguration {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment