polish #761 update pkg name & maven coordinate for Greenwich

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java

@@ -14,17 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alicloud.ans.registry.AnsAutoServiceRegistration;
-import org.springframework.cloud.alicloud.ans.registry.AnsRegistration;
-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;
@@ -32,6 +28,11 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.alibaba.alicloud.ans.registry.AnsAutoServiceRegistration;
+import com.alibaba.alicloud.ans.registry.AnsRegistration;
+import com.alibaba.alicloud.ans.registry.AnsServiceRegistry;
+import com.alibaba.alicloud.context.ans.AnsProperties;
+
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClient.java

@@ -14,15 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
 
-import com.alibaba.ans.core.NamingService;
-import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 
-import java.util.*;
+import com.alibaba.ans.core.NamingService;
+import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
 
 /**
  * @author xiaolongzuo

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
 
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/AnsServiceInstance.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
 
 import java.net.URI;
 import java.util.Map;

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ConditionalOnAnsEnabled.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpoint.java

@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.endpoint;
-
-import com.alibaba.ans.core.NamingService;
-import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
-import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+package com.alibaba.alicloud.ans.endpoint;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
+import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
+
+import com.alibaba.alicloud.context.ans.AnsProperties;
+import com.alibaba.ans.core.NamingService;
+import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
+
 /**
  * @author xiaolongzuo
  * @author pbting

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.endpoint;
+package com.alibaba.alicloud.ans.endpoint;
 
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 import org.springframework.context.annotation.Bean;
 
+import com.alibaba.alicloud.context.ans.AnsProperties;
+
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/registry/AnsRegistration.java

@@ -14,9 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
+
+import java.net.URI;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
 
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.ManagementServerPortUtils;
@@ -25,9 +29,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.util.StringUtils;
 
-import javax.annotation.PostConstruct;
-import java.net.URI;
-import java.util.Map;
+import com.alibaba.alicloud.context.ans.AnsProperties;
 
 /**
  * @author xiaolongzuo

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/registry/AnsServiceRegistry.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
 
-import com.alibaba.ans.core.NamingService;
-import com.alibaba.ans.shaded.com.taobao.vipserver.client.ipms.NodeReactor;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import com.alibaba.ans.core.NamingService;
+import com.alibaba.ans.shaded.com.taobao.vipserver.client.ipms.NodeReactor;
 
 /**
  * @author xiaolongzuo

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
 
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ServerList;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ServerList;
+
 /**
  * @author xiaolongzuo
  * @author pbting

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServer.java

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
 
 import java.util.Collections;
 import java.util.Map;
 
 import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
+
 import com.netflix.loadbalancer.Server;
 
 /**

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServerList.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.alibaba.ans.core.NamingService;
 import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
+
 import com.netflix.client.config.IClientConfig;
 import com.netflix.loadbalancer.AbstractServerList;
 

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/ConditionalOnRibbonAns.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-cloud-alicloud-ans/src/main/java/com/alibaba/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java

@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
 
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alicloud.ans.ConditionalOnAnsEnabled;
 import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
 import org.springframework.cloud.netflix.ribbon.RibbonClients;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.context.annotation.Configuration;
 
+import com.alibaba.alicloud.ans.ConditionalOnAnsEnabled;
+
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-ans/src/main/resources/META-INF/spring.factories

@@ -1,5 +1,5 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  org.springframework.cloud.alicloud.ans.endpoint.AnsEndpointAutoConfiguration,\
-  org.springframework.cloud.alicloud.ans.ribbon.RibbonAnsAutoConfiguration,\
-  org.springframework.cloud.alicloud.ans.AnsAutoConfiguration,\
-  org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration
+  com.alibaba.alicloud.ans.endpoint.AnsEndpointAutoConfiguration,\
+  com.alibaba.alicloud.ans.ribbon.RibbonAnsAutoConfiguration,\
+  com.alibaba.alicloud.ans.AnsAutoConfiguration,\
+  com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration

spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/AnsDiscoveryClientTests.java

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
-import static org.springframework.cloud.alicloud.ans.test.AnsMockTest.hostInstance;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -34,6 +33,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.springframework.cloud.client.ServiceInstance;
 
+import com.alibaba.alicloud.ans.test.AnsMockTest;
 import com.alibaba.ans.core.NamingService;
 import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
 
@@ -57,7 +57,7 @@ public class AnsDiscoveryClientTests {
 		map.put("test-key", "test-value");
 		map.put("secure", "true");
 
-		hosts.add(hostInstance(serviceName, false, host, port, map));
+		hosts.add(AnsMockTest.hostInstance(serviceName, false, host, port, map));
 
 		PowerMockito.mockStatic(NamingService.class);
 		when(NamingService.getHosts(eq(serviceName))).thenReturn(hosts);

spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -26,13 +26,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsProperties;
+
 /**
  * @author xiaojing
  */

spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
 
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 import java.net.Inet4Address;
@@ -25,21 +25,21 @@ import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.util.Enumeration;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
 import org.springframework.cloud.commons.util.InetUtils;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsProperties;
+
 /**
  * @author xiaojing
  */

spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -26,13 +26,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsProperties;
+
 /**
  * @author xiaojing
  */

spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java

@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-import static org.springframework.cloud.alicloud.ans.registry.AnsRegistration.MANAGEMENT_CONTEXT_PATH;
-import static org.springframework.cloud.alicloud.ans.registry.AnsRegistration.MANAGEMENT_PORT;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,13 +26,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsProperties;
+
 /**
  * @author xiaojing
  */
@@ -70,11 +69,11 @@ public class AnsAutoServiceRegistrationManagementPortTests {
 
 	private void checkoutNacosDiscoveryManagementData() {
 		assertEquals("AnsProperties management port was wrong", "8888",
-				properties.getClientMetadata().get(MANAGEMENT_PORT));
+				properties.getClientMetadata().get(AnsRegistration.MANAGEMENT_PORT));
 
 		assertEquals("AnsProperties management context path was wrong",
-				"/test-context-path",
-				properties.getClientMetadata().get(MANAGEMENT_CONTEXT_PATH));
+				"/test-context-path", properties.getClientMetadata()
+						.get(AnsRegistration.MANAGEMENT_CONTEXT_PATH));
 
 	}
 

spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -26,13 +26,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsProperties;
+
 /**
  * @author xiaojing
  */

spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -26,9 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.alibaba.ans.core.NamingService;
-import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,15 +33,18 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.endpoint.AnsEndpoint;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
 import org.springframework.cloud.commons.util.InetUtils;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.ans.endpoint.AnsEndpoint;
+import com.alibaba.alicloud.context.ans.AnsProperties;
+import com.alibaba.ans.core.NamingService;
+import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
+
 /**
  * @author xiaojing
  */

spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -22,8 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -31,12 +32,12 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.client.RestTemplate;
 
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+
 import com.netflix.client.config.DefaultClientConfigImpl;
 import com.netflix.client.config.IClientConfig;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
 /**
  * @author xiaojing
  */

spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServerListTests.java

@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.springframework.cloud.alicloud.ans.test.AnsMockTest.hostInstance;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,12 +28,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import com.alibaba.alicloud.ans.test.AnsMockTest;
 import com.alibaba.ans.core.NamingService;
 import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
 
@@ -59,7 +60,7 @@ public class AnsServerListTests {
 		AnsServerList serverList = new AnsServerList("test-service");
 		serverList.initWithNiwsConfig(clientConfig);
 		List<AnsServer> servers = serverList.getInitialListOfServers();
-		assertThat(servers).isEmpty();
+		Assertions.assertThat(servers).isEmpty();
 	}
 
 	@Test
@@ -67,7 +68,7 @@ public class AnsServerListTests {
 	public void testGetServers() throws Exception {
 
 		ArrayList<Host> hosts = new ArrayList<>();
-		hosts.add(hostInstance("test-service", true, Collections.emptyMap()));
+		hosts.add(AnsMockTest.hostInstance("test-service", true, Collections.emptyMap()));
 
 		PowerMockito.mockStatic(NamingService.class);
 		when(NamingService.getHosts(anyString())).thenReturn(hosts);
@@ -77,10 +78,10 @@ public class AnsServerListTests {
 		AnsServerList serverList = new AnsServerList("test-service");
 		serverList.initWithNiwsConfig(clientConfig);
 		List<AnsServer> servers = serverList.getInitialListOfServers();
-		assertThat(servers).hasSize(1);
+		Assertions.assertThat(servers).hasSize(1);
 
 		servers = serverList.getUpdatedListOfServers();
-		assertThat(servers).hasSize(1);
+		Assertions.assertThat(servers).hasSize(1);
 	}
 
 	@Test
@@ -92,20 +93,19 @@ public class AnsServerListTests {
 		map1.put("instanceNum", "1");
 		HashMap<String, String> map2 = new HashMap<>();
 		map2.put("instanceNum", "2");
-		hosts.add(hostInstance("test-service", false, map1));
-		hosts.add(hostInstance("test-service", true, map2));
+		hosts.add(AnsMockTest.hostInstance("test-service", false, map1));
+		hosts.add(AnsMockTest.hostInstance("test-service", true, map2));
 
 		PowerMockito.mockStatic(NamingService.class);
 		when(NamingService.getHosts(eq("test-service"))).thenReturn(
 				hosts.stream().filter(Host::isValid).collect(Collectors.toList()));
 
-
 		IClientConfig clientConfig = mock(IClientConfig.class);
 		when(clientConfig.getClientName()).thenReturn("test-service");
 		AnsServerList serverList = new AnsServerList("test-service");
 		serverList.initWithNiwsConfig(clientConfig);
 		List<AnsServer> servers = serverList.getInitialListOfServers();
-		assertThat(servers).hasSize(1);
+		Assertions.assertThat(servers).hasSize(1);
 
 		AnsServer ansServer = servers.get(0);
 		Host host = ansServer.getHealthService();
@@ -123,7 +123,7 @@ public class AnsServerListTests {
 
 		HashMap<String, String> map = new HashMap<>();
 		map.put("instanceNum", "1");
-		hosts.add(hostInstance("test-service", true, map));
+		hosts.add(AnsMockTest.hostInstance("test-service", true, map));
 
 		PowerMockito.mockStatic(NamingService.class);
 		when(NamingService.getHosts(eq("test-service"))).thenReturn(
@@ -135,7 +135,7 @@ public class AnsServerListTests {
 		serverList.initWithNiwsConfig(clientConfig);
 
 		List<AnsServer> servers = serverList.getUpdatedListOfServers();
-		assertThat(servers).hasSize(1);
+		Assertions.assertThat(servers).hasSize(1);
 
 		assertThat(servers.get(0).getHealthService().isValid()).isEqualTo(true);
 	}

spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServiceListTests.java

@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
@@ -26,6 +28,7 @@ import java.util.List;
 import org.junit.Test;
 
 import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
+
 import com.netflix.loadbalancer.Server;
 
 /**

spring-cloud-alicloud-ans/src/test/java/com/alibaba/alicloud/ans/test/AnsMockTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans.test;
+package com.alibaba.alicloud.ans.test;
 
 import java.util.Map;