diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/DiscoveryPropertiesAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/DiscoveryPropertiesAutoConfiguration.java index 8d4a751b..43ca4b99 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/DiscoveryPropertiesAutoConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/DiscoveryPropertiesAutoConfiguration.java @@ -29,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; /** * Common configuration of discovery. @@ -38,9 +37,26 @@ import org.springframework.context.annotation.Import; */ @Configuration(proxyBeanMethods = false) @ConditionalOnPolarisEnabled -@Import({PolarisDiscoveryProperties.class, ConsulContextProperties.class, NacosContextProperties.class}) public class DiscoveryPropertiesAutoConfiguration { + @Bean + @ConditionalOnMissingBean + public PolarisDiscoveryProperties polarisDiscoveryProperties() { + return new PolarisDiscoveryProperties(); + } + + @Bean + @ConditionalOnMissingBean + public ConsulContextProperties consulContextProperties() { + return new ConsulContextProperties(); + } + + @Bean + @ConditionalOnMissingBean + public NacosContextProperties nacosContextProperties() { + return new NacosContextProperties(); + } + @Bean @ConditionalOnMissingBean public PolarisDiscoveryHandler polarisDiscoveryHandler(PolarisDiscoveryProperties polarisDiscoveryProperties, diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/DiscoveryPropertiesAutoConfigurationTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/DiscoveryPropertiesAutoConfigurationTest.java index d77e36c6..eb1aedb5 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/DiscoveryPropertiesAutoConfigurationTest.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/DiscoveryPropertiesAutoConfigurationTest.java @@ -51,21 +51,6 @@ public class DiscoveryPropertiesAutoConfigurationTest { }); } - @Test - public void testInit() { - ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner().withConfiguration( - AutoConfigurations.of( - PolarisContextAutoConfiguration.class, - TestConfiguration.class, - DiscoveryPropertiesAutoConfiguration.class)) - .withPropertyValues("spring.cloud.polaris.discovery.register=false") - .withPropertyValues("spring.cloud.consul.discovery.register=false") - .withPropertyValues("spring.cloud.consul.discovery.enabled=false"); - applicationContextRunner.run(context -> { - assertThat(context).hasSingleBean(DiscoveryPropertiesAutoConfiguration.class); - }); - } - @Configuration static class TestConfiguration { @Bean