Merge branch '2020.0' of github.com:Tencent/spring-cloud-tencent into 2020.0

 Conflicts:

	spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/LoadBalancerConfiguration.java

spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/LoadBalancerConfiguration.java

@@ -22,7 +22,6 @@ import com.tencent.cloud.polaris.router.PolarisRouterServiceInstanceListSupplier
 import com.tencent.polaris.router.api.core.RouterAPI;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.client.ConditionalOnBlockingDiscoveryEnabled;
 import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
 import org.springframework.cloud.client.ConditionalOnReactiveDiscoveryEnabled;
@@ -54,7 +53,6 @@ public class LoadBalancerConfiguration {
 
 		@Bean
 		@ConditionalOnBean(ReactiveDiscoveryClient.class)
-		@ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "polaris")
 		public ServiceInstanceListSupplier polarisRouterDiscoveryClientServiceInstanceListSupplier(
 				ConfigurableApplicationContext context,
 				RouterAPI routerAPI,
@@ -78,7 +76,6 @@ public class LoadBalancerConfiguration {
 
 		@Bean
 		@ConditionalOnBean(DiscoveryClient.class)
-		@ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "polaris")
 		public ServiceInstanceListSupplier polarisRouterDiscoveryClientServiceInstanceListSupplier(
 				ConfigurableApplicationContext context,
 				RouterAPI routerAPI,

spring-cloud-tencent-examples/polaris-router-example/router-caller-service/src/main/resources/bootstrap.yml

@@ -8,8 +8,6 @@ spring:
       metadata:
         content:
           k1: v1
-    loadbalancer:
-      configurations: polaris
     polaris:
       address: grpc://183.47.111.80:8091
       namespace: default

spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/PolarisLoadBalancer.java

@@ -72,14 +72,6 @@ public class PolarisLoadBalancer extends RoundRobinLoadBalancer {
 		this.routerAPI = routerAPI;
 	}
 
-	private static ServiceInstances convertToPolarisServiceInstances(List<ServiceInstance> serviceInstances) {
-		ServiceKey serviceKey = new ServiceKey(MetadataContext.LOCAL_NAMESPACE, serviceInstances.get(0).getServiceId());
-		List<Instance> polarisInstances = serviceInstances.stream()
-				.map(serviceInstance -> ((PolarisServiceInstance) serviceInstance).getPolarisInstance())
-				.collect(Collectors.toList());
-		return new DefaultServiceInstances(serviceKey, polarisInstances);
-	}
-
 	@Override
 	public Mono<Response<ServiceInstance>> choose(Request request) {
 		if (!loadBalancerProperties.getEnabled()) {
@@ -111,4 +103,12 @@ public class PolarisLoadBalancer extends RoundRobinLoadBalancer {
 		}
 	}
 
+	private static ServiceInstances convertToPolarisServiceInstances(List<ServiceInstance> serviceInstances) {
+		ServiceKey serviceKey = new ServiceKey(MetadataContext.LOCAL_NAMESPACE, serviceInstances.get(0).getServiceId());
+		List<Instance> polarisInstances = serviceInstances.stream()
+				.map(serviceInstance -> ((PolarisServiceInstance) serviceInstance).getPolarisInstance())
+				.collect(Collectors.toList());
+		return new DefaultServiceInstances(serviceKey, polarisInstances);
+	}
+
 }