Fixes alibaba#333 ,make @EnableDiscoveryClient Optional

theonefx · Jan 31, 2019 · 196266a · 196266a
1 parent 5056b24
commit 196266a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/...rc/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java b/...rc/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java
@@ -41,9 +41,7 @@
 @ConditionalOnNacosDiscoveryEnabled
 @ConditionalOnClass(name = "org.springframework.boot.web.servlet.context.ServletWebServerInitializedEvent")
 @ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
-@AutoConfigureBefore({ AutoServiceRegistrationAutoConfiguration.class,
-		NacosDiscoveryClientAutoConfiguration.class })
-@AutoConfigureAfter(AutoServiceRegistrationConfiguration.class)
+@AutoConfigureAfter({ AutoServiceRegistrationAutoConfiguration.class })
 public class NacosDiscoveryAutoConfiguration {
 
 	@Bean

diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/spring.factories
@@ -1,6 +1,5 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration,\
   org.springframework.cloud.alibaba.nacos.ribbon.RibbonNacosAutoConfiguration,\
-  org.springframework.cloud.alibaba.nacos.endpoint.NacosDiscoveryEndpointAutoConfiguration
-org.springframework.cloud.client.discovery.EnableDiscoveryClient=\
-org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration
+  org.springframework.cloud.alibaba.nacos.endpoint.NacosDiscoveryEndpointAutoConfiguration,\
+  org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration
diff --git a/...icloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java b/...icloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java
@@ -17,7 +17,6 @@
 package org.springframework.cloud.alicloud.ans;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -28,7 +27,6 @@
 import org.springframework.cloud.alicloud.ans.registry.AnsServiceRegistry;
 import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration;
-import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -44,9 +42,7 @@
 @ConditionalOnClass(name = "org.springframework.boot.web.context.WebServerInitializedEvent")
 @ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
 @ConditionalOnAnsEnabled
-@AutoConfigureBefore({ AutoServiceRegistrationAutoConfiguration.class,
-		AnsDiscoveryClientAutoConfiguration.class })
-@AutoConfigureAfter(AutoServiceRegistrationConfiguration.class)
+@AutoConfigureAfter(AutoServiceRegistrationAutoConfiguration.class)
 public class AnsAutoConfiguration {
 
 	@Bean

diff --git a/spring-cloud-alicloud-ans/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-ans/src/main/resources/META-INF/spring.factories
@@ -3,6 +3,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springframework.cloud.alicloud.ans.ribbon.RibbonAnsAutoConfiguration,\
   org.springframework.cloud.alicloud.ans.AnsAutoConfiguration,\
   org.springframework.cloud.alicloud.ans.migrate.MigrateEndpointAutoConfiguration,\
-  org.springframework.cloud.alicloud.ans.migrate.MigrationAutoconfiguration
-org.springframework.cloud.client.discovery.EnableDiscoveryClient=\
+  org.springframework.cloud.alicloud.ans.migrate.MigrationAutoconfiguration,\
   org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration