refactor import in greenwich

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java

@@ -24,10 +24,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.StringUtils;
-
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
 import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
@@ -37,6 +33,10 @@ import com.alibaba.csp.sentinel.slots.system.SystemRule;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.util.StringUtils;
 
 /**
  * Convert sentinel rules for json or xml array Using strict mode to parse json or xml

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java

@@ -19,11 +19,11 @@ package com.alibaba.cloud.sentinel.datasource.factorybean;
 import java.io.File;
 import java.nio.charset.Charset;
 
-import org.springframework.beans.factory.FactoryBean;
-
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource;
 
+import org.springframework.beans.factory.FactoryBean;
+
 /**
  * A {@link FactoryBean} for creating {@link FileRefreshableDataSource} instance.
  *

spring-cloud-alibaba-sentinel-datasource/src/main/java/com/alibaba/cloud/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java

@@ -16,12 +16,13 @@
 
 package com.alibaba.cloud.sentinel.datasource.factorybean;
 
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.FactoryBean;
-
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.zookeeper.ZookeeperDataSource;
 
+import org.apache.commons.lang3.StringUtils;
+
+import org.springframework.beans.factory.FactoryBean;
+
 /**
  * A {@link FactoryBean} for creating {@link ZookeeperDataSource} instance.
  *

spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/SentinelGatewayAutoConfiguration.java

@@ -22,11 +22,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter;
 import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter;
 import com.alibaba.csp.sentinel.adapter.gateway.common.api.ApiDefinition;
@@ -46,6 +41,11 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */

spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelGatewayProperties.java

@@ -16,13 +16,13 @@
 
 package com.alibaba.cloud.sentinel.gateway.scg;
 
+import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
+import com.alibaba.cloud.sentinel.gateway.FallbackProperties;
+
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.core.Ordered;
 
-import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
-import com.alibaba.cloud.sentinel.gateway.FallbackProperties;
-
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */

spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java

@@ -16,16 +16,26 @@
 
 package com.alibaba.cloud.sentinel.gateway.scg;
 
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
 import javax.annotation.PostConstruct;
 
+import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
+import com.alibaba.cloud.sentinel.gateway.FallbackProperties;
+import com.alibaba.csp.sentinel.adapter.gateway.sc.SentinelGatewayFilter;
+import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.BlockRequestHandler;
+import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager;
+import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.RedirectBlockRequestHandler;
+import com.alibaba.csp.sentinel.adapter.gateway.sc.exception.SentinelGatewayBlockExceptionHandler;
+import com.alibaba.csp.sentinel.config.SentinelConfig;
+import com.alibaba.csp.sentinel.util.StringUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import reactor.core.publisher.Mono;
+
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -43,17 +53,7 @@ import org.springframework.web.reactive.function.server.ServerResponse;
 import org.springframework.web.reactive.result.view.ViewResolver;
 import org.springframework.web.server.ServerWebExchange;
 
-import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
+import static org.springframework.web.reactive.function.BodyInserters.fromObject;
-import com.alibaba.cloud.sentinel.gateway.FallbackProperties;
-import com.alibaba.csp.sentinel.adapter.gateway.sc.SentinelGatewayFilter;
-import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.BlockRequestHandler;
-import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager;
-import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.RedirectBlockRequestHandler;
-import com.alibaba.csp.sentinel.adapter.gateway.sc.exception.SentinelGatewayBlockExceptionHandler;
-import com.alibaba.csp.sentinel.config.SentinelConfig;
-import com.alibaba.csp.sentinel.util.StringUtil;
-
-import reactor.core.publisher.Mono;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>

spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/FallBackProviderHandler.java

@@ -2,16 +2,17 @@ package com.alibaba.cloud.sentinel.gateway.zuul;
 
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.SmartInitializingSingleton;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.util.CollectionUtils;
-
 import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.DefaultBlockFallbackProvider;
 import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.ZuulBlockFallbackManager;
 import com.alibaba.csp.sentinel.adapter.gateway.zuul.fallback.ZuulBlockFallbackProvider;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.beans.factory.SmartInitializingSingleton;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.util.CollectionUtils;
+
 /**
  * @author tiger
  */

spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java

@@ -20,17 +20,6 @@ import java.util.Optional;
 
 import javax.annotation.PostConstruct;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
 import com.alibaba.csp.sentinel.adapter.gateway.zuul.callback.RequestOriginParser;
 import com.alibaba.csp.sentinel.adapter.gateway.zuul.callback.ZuulGatewayCallbackManager;
@@ -40,6 +29,17 @@ import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulPreFilt
 import com.alibaba.csp.sentinel.config.SentinelConfig;
 
 import com.netflix.zuul.http.ZuulServlet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 /**
  * Sentinel Spring Cloud Zuul AutoConfiguration

spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java

@@ -16,15 +16,15 @@
 
 package com.alibaba.cloud.sentinel.gateway.zuul;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
-
 import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
 import com.alibaba.csp.sentinel.adapter.gateway.zuul.constants.ZuulConstant;
 import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulErrorFilter;
 import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulPostFilter;
 import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulPreFilter;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
+
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */

spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java

@@ -23,15 +23,16 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import com.alibaba.edas.acm.ConfigService;
+import com.alibaba.edas.acm.exception.ConfigException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.util.StringUtils;
 
-import com.alibaba.edas.acm.ConfigService;
-import com.alibaba.edas.acm.exception.ConfigException;
-
 /**
  * @author juven.xuxb
  * @author xiaolongzuo

spring-cloud-alicloud-acm/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceLocator.java

@@ -16,6 +16,8 @@
 
 package com.alibaba.alicloud.acm.bootstrap;
 
+import com.alibaba.alicloud.context.acm.AcmIntegrationProperties;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
@@ -23,8 +25,6 @@ import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;
 
-import com.alibaba.alicloud.context.acm.AcmIntegrationProperties;
-
 /**
  * @author juven.xuxb
  * @author xiaolongzuo

spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmConfigurationTests.java

@@ -16,14 +16,16 @@
 
 package com.alibaba.alicloud.acm;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
-
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 
+import com.alibaba.alicloud.acm.bootstrap.AcmPropertySourceLocator;
+import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
+import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import com.alibaba.alicloud.context.acm.AcmIntegrationProperties;
+import com.alibaba.alicloud.context.acm.AcmProperties;
+import com.alibaba.edas.acm.ConfigService;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,6 +34,7 @@ import org.powermock.api.support.MethodProxy;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.modules.junit4.PowerMockRunnerDelegate;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -40,12 +43,10 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.alibaba.alicloud.acm.bootstrap.AcmPropertySourceLocator;
+import static org.junit.Assert.assertArrayEquals;
-import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
+import static org.junit.Assert.assertEquals;
-import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import static org.junit.Assert.assertNotNull;
-import com.alibaba.alicloud.context.acm.AcmIntegrationProperties;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
-import com.alibaba.alicloud.context.acm.AcmProperties;
-import com.alibaba.edas.acm.ConfigService;
 
 /**
  * @author xiaojing

spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmFileExtensionTest.java

@@ -16,11 +16,13 @@
 
 package com.alibaba.alicloud.acm;
 
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
-
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 
+import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
+import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import com.alibaba.edas.acm.ConfigService;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -29,6 +31,7 @@ import org.powermock.api.support.MethodProxy;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.modules.junit4.PowerMockRunnerDelegate;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -37,9 +40,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
-import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
-import com.alibaba.edas.acm.ConfigService;
 
 /**
  * @author xiaojing

spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/AcmGroupConfigurationTest.java

@@ -16,11 +16,13 @@
 
 package com.alibaba.alicloud.acm;
 
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
-
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 
+import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
+import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import com.alibaba.edas.acm.ConfigService;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -29,6 +31,7 @@ import org.powermock.api.support.MethodProxy;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.modules.junit4.PowerMockRunnerDelegate;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -37,9 +40,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
-import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
-import com.alibaba.edas.acm.ConfigService;
 
 /**
  * @author xiaojing

spring-cloud-alicloud-acm/src/test/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointTests.java

@@ -16,15 +16,19 @@
 
 package com.alibaba.alicloud.acm.endpoint;
 
-import static org.junit.Assert.assertEquals;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
-
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import com.alibaba.alicloud.acm.AcmAutoConfiguration;
+import com.alibaba.alicloud.acm.AcmPropertySourceRepository;
+import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory;
+import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import com.alibaba.alicloud.context.acm.AcmProperties;
+import com.alibaba.edas.acm.ConfigService;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,6 +37,7 @@ import org.powermock.api.support.MethodProxy;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.modules.junit4.PowerMockRunnerDelegate;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.health.Health.Builder;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -41,12 +46,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.alibaba.alicloud.acm.AcmAutoConfiguration;
+import static org.junit.Assert.assertEquals;
-import com.alibaba.alicloud.acm.AcmPropertySourceRepository;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
-import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory;
-import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
-import com.alibaba.alicloud.context.acm.AcmProperties;
-import com.alibaba.edas.acm.ConfigService;
 
 /**
  * @author xiaojing

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

@@ -16,6 +16,11 @@
 
 package com.alibaba.alicloud.ans;
 
+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;
+
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -28,11 +33,6 @@ 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

@@ -23,12 +23,12 @@ 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 com.alibaba.ans.core.NamingService;
 import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
 
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+
 /**
  * @author xiaolongzuo
  * @author pbting

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

@@ -21,15 +21,16 @@ 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;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
+import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
+
 /**
  * @author xiaolongzuo
  * @author pbting

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

@@ -16,13 +16,13 @@
 
 package com.alibaba.alicloud.ans.endpoint;
 
+import com.alibaba.alicloud.context.ans.AnsProperties;
+
 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.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

@@ -18,6 +18,7 @@ package com.alibaba.alicloud.ans.registry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
 import org.springframework.cloud.client.serviceregistry.ServiceRegistry;

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

@@ -21,6 +21,8 @@ import java.util.Map;
 
 import javax.annotation.PostConstruct;
 
+import com.alibaba.alicloud.context.ans.AnsProperties;
+
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.ManagementServerPortUtils;
@@ -29,8 +31,6 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.util.StringUtils;
 
-import com.alibaba.alicloud.context.ans.AnsProperties;
-
 /**
  * @author xiaolongzuo
  */

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

@@ -20,13 +20,14 @@ 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;
+
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
 
-import com.alibaba.ans.core.NamingService;
+import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
-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

@@ -16,13 +16,13 @@
 
 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/RibbonAnsAutoConfiguration.java

@@ -16,6 +16,8 @@
 
 package com.alibaba.alicloud.ans.ribbon;
 
+import com.alibaba.alicloud.ans.ConditionalOnAnsEnabled;
+
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -24,8 +26,6 @@ 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/test/java/com/alibaba/alicloud/ans/AnsDiscoveryClientTests.java

@@ -16,26 +16,27 @@
 
 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 java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import com.alibaba.alicloud.ans.test.AnsMockTest;
+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.powermock.api.mockito.PowerMockito;
 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 static org.assertj.core.api.Assertions.assertThat;
-import com.alibaba.ans.core.NamingService;
+import static org.mockito.ArgumentMatchers.eq;
-import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
+import static org.mockito.Mockito.when;
 
 /**
  * @author xiaojing

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

@@ -16,12 +16,13 @@
 
 package com.alibaba.alicloud.ans.registry;
 
-import static org.junit.Assert.assertFalse;
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
-import static org.junit.Assert.assertNotNull;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+import com.alibaba.alicloud.context.ans.AnsProperties;
 
 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;
@@ -30,9 +31,9 @@ import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationC
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import static org.junit.Assert.assertFalse;
-import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import static org.junit.Assert.assertNotNull;
-import com.alibaba.alicloud.context.ans.AnsProperties;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 /**
  * @author xiaojing

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

@@ -16,17 +16,18 @@
 
 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 java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.util.Enumeration;
 
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsProperties;
+
 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;
@@ -36,9 +37,9 @@ 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 static org.junit.Assert.assertEquals;
-import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import static org.junit.Assert.assertNotNull;
-import com.alibaba.alicloud.context.ans.AnsProperties;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 /**
  * @author xiaojing

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

@@ -16,12 +16,13 @@
 
 package com.alibaba.alicloud.ans.registry;
 
-import static org.junit.Assert.assertEquals;
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
-import static org.junit.Assert.assertNotNull;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+import com.alibaba.alicloud.context.ans.AnsProperties;
 
 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;
@@ -30,9 +31,9 @@ import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationC
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import static org.junit.Assert.assertEquals;
-import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import static org.junit.Assert.assertNotNull;
-import com.alibaba.alicloud.context.ans.AnsProperties;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 /**
  * @author xiaojing

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

@@ -16,12 +16,13 @@
 
 package com.alibaba.alicloud.ans.registry;
 
-import static org.junit.Assert.assertEquals;
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
-import static org.junit.Assert.assertNotNull;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+import com.alibaba.alicloud.context.ans.AnsProperties;
 
 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;
@@ -30,9 +31,9 @@ import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationC
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import static org.junit.Assert.assertEquals;
-import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import static org.junit.Assert.assertNotNull;
-import com.alibaba.alicloud.context.ans.AnsProperties;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 /**
  * @author xiaojing

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

@@ -16,12 +16,13 @@
 
 package com.alibaba.alicloud.ans.registry;
 
-import static org.junit.Assert.assertEquals;
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
-import static org.junit.Assert.assertNotNull;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+import com.alibaba.alicloud.context.ans.AnsProperties;
 
 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;
@@ -30,9 +31,9 @@ import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationC
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import static org.junit.Assert.assertEquals;
-import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import static org.junit.Assert.assertNotNull;
-import com.alibaba.alicloud.context.ans.AnsProperties;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 /**
  * @author xiaojing

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

@@ -16,18 +16,21 @@
 
 package com.alibaba.alicloud.ans.registry;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+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;
+
 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;
@@ -38,12 +41,10 @@ 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 static org.junit.Assert.assertEquals;
-import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import static org.junit.Assert.assertNotNull;
-import com.alibaba.alicloud.ans.endpoint.AnsEndpoint;
+import static org.junit.Assert.assertTrue;
-import com.alibaba.alicloud.context.ans.AnsProperties;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-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

@@ -16,11 +16,14 @@
 
 package com.alibaba.alicloud.ans.ribbon;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
 
+import com.netflix.client.config.DefaultClientConfigImpl;
+import com.netflix.client.config.IClientConfig;
 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;
@@ -32,11 +35,8 @@ 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 static org.assertj.core.api.Assertions.assertThat;
-import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-import com.netflix.client.config.DefaultClientConfigImpl;
-import com.netflix.client.config.IClientConfig;
 
 /**
  * @author xiaojing

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

@@ -16,18 +16,17 @@
 
 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 java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.alibaba.alicloud.ans.test.AnsMockTest;
+import com.alibaba.ans.core.NamingService;
+import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
+
+import com.netflix.client.config.IClientConfig;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,11 +34,11 @@ 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 static org.assertj.core.api.Assertions.assertThat;
-import com.alibaba.ans.core.NamingService;
+import static org.mockito.ArgumentMatchers.anyString;
-import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
+import static org.mockito.ArgumentMatchers.eq;
-
+import static org.mockito.Mockito.mock;
-import com.netflix.client.config.IClientConfig;
+import static org.mockito.Mockito.when;
 
 /**
  * @author xiaojing

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

@@ -16,21 +16,20 @@
 
 package com.alibaba.alicloud.ans.ribbon;
 
+import java.util.Arrays;
+import java.util.List;
+
+import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
+
+import com.netflix.loadbalancer.Server;
+import org.junit.Test;
+
 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;
 
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
-
-import com.netflix.loadbalancer.Server;
-
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/AliCloudProperties.java

@@ -16,10 +16,10 @@
 
 package com.alibaba.alicloud.context;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import com.alibaba.cloud.context.AliCloudConfiguration;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/acm/AcmContextBootstrapConfiguration.java

@@ -18,6 +18,11 @@ package com.alibaba.alicloud.context.acm;
 
 import javax.annotation.PostConstruct;
 
+import com.alibaba.alicloud.context.AliCloudProperties;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasProperties;
+import com.alibaba.cloud.context.acm.AliCloudAcmInitializer;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -28,11 +33,6 @@ import org.springframework.core.env.Environment;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
-import com.alibaba.alicloud.context.AliCloudProperties;
-import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
-import com.alibaba.alicloud.context.edas.EdasProperties;
-import com.alibaba.cloud.context.acm.AliCloudAcmInitializer;
-
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/acm/AcmProperties.java

@@ -16,11 +16,11 @@
 
 package com.alibaba.alicloud.context.acm;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import com.alibaba.cloud.context.AliCloudServerMode;
 import com.alibaba.cloud.context.acm.AcmConfiguration;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
 /**
  * acm properties
  *

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

@@ -16,15 +16,15 @@
 
 package com.alibaba.alicloud.context.ans;
 
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.event.ContextRefreshedEvent;
-
 import com.alibaba.alicloud.context.AliCloudProperties;
 import com.alibaba.alicloud.context.edas.EdasProperties;
 import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener;
 import com.alibaba.cloud.context.ans.AliCloudAnsInitializer;
 import com.alibaba.cloud.context.edas.AliCloudEdasSdk;
 
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.event.ContextRefreshedEvent;
+
 /**
  * Init {@link com.alibaba.ans.core.NamingService} properties.
  *

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

@@ -16,13 +16,13 @@
 
 package com.alibaba.alicloud.context.ans;
 
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
-import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
-
 /**
  * @author xiaolongzuo
  */

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

@@ -26,15 +26,15 @@ import java.util.Map;
 
 import javax.annotation.PostConstruct;
 
+import com.alibaba.cloud.context.AliCloudServerMode;
+import com.alibaba.cloud.context.ans.AnsConfiguration;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.commons.util.InetUtils;
 import org.springframework.util.StringUtils;
 
-import com.alibaba.cloud.context.AliCloudServerMode;
-import com.alibaba.cloud.context.ans.AnsConfiguration;
-
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/edas/EdasContextAutoConfiguration.java

@@ -16,6 +16,11 @@
 
 package com.alibaba.alicloud.context.edas;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.AliCloudProperties;
+import com.alibaba.cloud.context.edas.AliCloudEdasSdk;
+import com.alibaba.cloud.context.edas.AliCloudEdasSdkFactory;
+
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -23,11 +28,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
-import com.alibaba.alicloud.context.AliCloudProperties;
-import com.alibaba.cloud.context.edas.AliCloudEdasSdk;
-import com.alibaba.cloud.context.edas.AliCloudEdasSdkFactory;
-
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/edas/EdasProperties.java

@@ -16,11 +16,11 @@
 
 package com.alibaba.alicloud.context.edas;
 
+import com.alibaba.cloud.context.edas.EdasConfiguration;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-import com.alibaba.cloud.context.edas.EdasConfiguration;
-
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListener.java

@@ -1,13 +1,14 @@
 package com.alibaba.alicloud.context.nacos;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
-
 import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener;
 import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
 import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
+
 /**
  * @author pbting
  */

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java

@@ -17,14 +17,15 @@ package com.alibaba.alicloud.context.nacos;
 
 import java.util.Properties;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
-
 import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener;
 import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
 import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
+
 /**
  * @author pbting
  * @date 2019-02-14 11:12 AM

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/oss/OssContextAutoConfiguration.java

@@ -16,6 +16,13 @@
 
 package com.alibaba.alicloud.context.oss;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.AliCloudProperties;
+import com.alibaba.cloud.context.AliCloudAuthorizationMode;
+
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -26,13 +33,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
-import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
-import com.alibaba.alicloud.context.AliCloudProperties;
-import com.alibaba.cloud.context.AliCloudAuthorizationMode;
-
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClientBuilder;
-
 /**
  * OSS Auto {@link Configuration}
  *

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/oss/OssProperties.java

@@ -16,13 +16,13 @@
 
 package com.alibaba.alicloud.context.oss;
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import com.alibaba.cloud.context.AliCloudAuthorizationMode;
 
 import com.aliyun.oss.ClientBuilderConfiguration;
 
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
 /**
  * {@link ConfigurationProperties} for configuring OSS.
  *

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/scx/ScxContextAutoConfiguration.java

@@ -16,6 +16,13 @@
 
 package com.alibaba.alicloud.context.scx;
 
+import com.alibaba.alicloud.context.AliCloudProperties;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasProperties;
+import com.alibaba.cloud.context.edas.AliCloudEdasSdk;
+import com.alibaba.cloud.context.scx.AliCloudScxInitializer;
+import com.alibaba.edas.schedulerx.SchedulerXClient;
+
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -24,13 +31,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.alibaba.alicloud.context.AliCloudProperties;
-import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
-import com.alibaba.alicloud.context.edas.EdasProperties;
-import com.alibaba.cloud.context.edas.AliCloudEdasSdk;
-import com.alibaba.cloud.context.scx.AliCloudScxInitializer;
-import com.alibaba.edas.schedulerx.SchedulerXClient;
-
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/scx/ScxProperties.java

@@ -16,10 +16,10 @@
 
 package com.alibaba.alicloud.context.scx;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import com.alibaba.cloud.context.scx.ScxConfiguration;
 
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListener.java

@@ -16,15 +16,16 @@
 
 package com.alibaba.alicloud.context.sentinel;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
-
 import com.alibaba.alicloud.context.Constants;
 import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener;
 import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
 import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
+
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  */

spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/statistics/StatisticsTaskStarter.java

@@ -19,11 +19,6 @@ package com.alibaba.alicloud.context.statistics;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.context.annotation.Configuration;
-
 import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
 import com.alibaba.alicloud.context.acm.AcmProperties;
 import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
@@ -37,6 +32,11 @@ import com.alibaba.cloud.context.AliCloudServerMode;
 import com.alibaba.cloud.context.edas.AliCloudEdasSdk;
 import com.alibaba.cloud.context.statistics.StatisticsTask;
 
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.context.annotation.Configuration;
+
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/AliCloudPropertiesTests.java

@@ -16,12 +16,13 @@
 
 package com.alibaba.alicloud.context;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-
 import org.junit.Test;
+
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/BaseAliCloudSpringApplication.java

@@ -20,6 +20,7 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.modules.junit4.PowerMockRunnerDelegate;
+
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;

spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/acm/AcmPropertiesTests.java

@@ -16,16 +16,17 @@
 
 package com.alibaba.alicloud.context.acm;
 
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-
-import org.junit.Test;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-
 import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
 import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
 import com.alibaba.cloud.context.AliCloudServerMode;
 
+import org.junit.Test;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
 /**
  * @author xiaolongzuo
  */

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

@@ -16,11 +16,11 @@
 
 package com.alibaba.alicloud.context.ans;
 
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
 
 import org.junit.Test;
 
-import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
 /**
  * @author xiaolongzuo

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

@@ -16,25 +16,26 @@
 
 package com.alibaba.alicloud.context.ans;
 
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.Vector;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+import com.alibaba.cloud.context.AliCloudServerMode;
+
 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 org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
-import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
-import com.alibaba.cloud.context.AliCloudServerMode;
 
 /**
  * @author xiaolongzuo

spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/edas/EdasPropertiesTests.java

@@ -16,13 +16,14 @@
 
 package com.alibaba.alicloud.context.edas;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
 
 import org.junit.Test;
+
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
-import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 /**
  * @author xiaolongzuo

spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java

@@ -16,16 +16,16 @@
 
 package com.alibaba.alicloud.context.nacos;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
+import com.alibaba.alicloud.utils.ChangeOrderUtils;
+import com.alibaba.cloud.context.ans.AliCloudAnsInitializer;
+import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 
-import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import com.alibaba.alicloud.utils.ChangeOrderUtils;
-import com.alibaba.cloud.context.ans.AliCloudAnsInitializer;
-import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 
 /**
  * @author xiaolongzuo

spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java

@@ -16,16 +16,16 @@
 
 package com.alibaba.alicloud.context.nacos;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
+import com.alibaba.alicloud.utils.ChangeOrderUtils;
+import com.alibaba.cloud.context.ans.AliCloudAnsInitializer;
+import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 
-import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import com.alibaba.alicloud.utils.ChangeOrderUtils;
-import com.alibaba.cloud.context.ans.AliCloudAnsInitializer;
-import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 
 /**
  * @author xiaolongzuo

spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/oss/OssAutoConfigurationTests.java

@@ -16,16 +16,16 @@
 
 package com.alibaba.alicloud.context.oss;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.Test;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-
 import com.alibaba.alicloud.context.AliCloudProperties;
 
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClient;
+import org.junit.Test;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * {@link OSS} {@link OssProperties} Test

spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/scx/ScxAutoConfigurationTests.java

@@ -16,13 +16,14 @@
 
 package com.alibaba.alicloud.context.scx;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import com.alibaba.alicloud.context.edas.EdasProperties;
 
 import org.junit.Test;
+
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
-import com.alibaba.alicloud.context.edas.EdasProperties;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author xiaolongzuo

spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListenerTests.java

@@ -16,16 +16,16 @@
 
 package com.alibaba.alicloud.context.sentinel;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
+import com.alibaba.alicloud.context.Constants;
+import com.alibaba.alicloud.utils.ChangeOrderUtils;
+import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 
-import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import com.alibaba.alicloud.context.Constants;
-import com.alibaba.alicloud.utils.ChangeOrderUtils;
-import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 
 /**
  * @author xiaolongzuo

spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/context/sms/SmsPropertiesTests.java

@@ -16,14 +16,15 @@
 
 package com.alibaba.alicloud.context.sms;
 
-import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
 
 import org.junit.Test;
+
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
-import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
 
 /**
  * @author xiaolongzuo

spring-cloud-alicloud-context/src/test/java/com/alibaba/alicloud/utils/ChangeOrderUtils.java

@@ -16,11 +16,11 @@
 
 package com.alibaba.alicloud.utils;
 
-import org.powermock.api.mockito.PowerMockito;
-
 import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
 import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 
+import org.powermock.api.mockito.PowerMockito;
+
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-oss/src/main/java/com/alibaba/alicloud/oss/endpoint/OssEndpoint.java

@@ -21,13 +21,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.aliyun.oss.OSSClient;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 import org.springframework.context.ApplicationContext;
 
-import com.aliyun.oss.OSSClient;
-
 /**
  * Actuator {@link Endpoint} to expose OSS Meta Data
  *

spring-cloud-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpoint.java

@@ -19,14 +19,15 @@ package com.alibaba.alicloud.scx.endpoint;
 import java.util.HashMap;
 import java.util.Map;
 
-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.edas.EdasProperties;
 import com.alibaba.alicloud.context.scx.ScxProperties;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
+import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
+
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-schedulerx/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java

@@ -16,6 +16,9 @@
 
 package com.alibaba.alicloud.scx.endpoint;
 
+import com.alibaba.alicloud.context.edas.EdasProperties;
+import com.alibaba.alicloud.context.scx.ScxProperties;
+
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -23,9 +26,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 
-import com.alibaba.alicloud.context.edas.EdasProperties;
-import com.alibaba.alicloud.context.scx.ScxProperties;
-
 /**
  * @author xiaolongzuo
  */

spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsInitializerEventListener.java

@@ -18,16 +18,16 @@ package com.alibaba.alicloud.sms;
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.springframework.boot.context.event.ApplicationStartedEvent;
-import org.springframework.context.ApplicationListener;
-import org.springframework.stereotype.Component;
-
 import com.alibaba.alicloud.context.sms.SmsProperties;
 import com.alibaba.alicloud.sms.base.MessageListener;
 
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.profile.DefaultProfile;
 
+import org.springframework.boot.context.event.ApplicationStartedEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
 /**
  * @author pbting
  */

spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/SmsServiceImpl.java

@@ -17,9 +17,6 @@ package com.alibaba.alicloud.sms;
 
 import java.text.ParseException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.alibaba.alicloud.context.AliCloudProperties;
 import com.alibaba.alicloud.context.sms.SmsProperties;
 import com.alibaba.alicloud.sms.base.DefaultAlicomMessagePuller;
@@ -34,6 +31,8 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.exceptions.ServerException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author pbting

spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/DefaultAlicomMessagePuller.java

@@ -25,14 +25,13 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 
-import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.aliyun.mns.client.CloudQueue;
 import com.aliyun.mns.common.ClientException;
 import com.aliyun.mns.common.ServiceException;
 import com.aliyun.mns.model.Message;
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 阿里通信官方消息默认拉取工具类

spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/base/TokenGetterForAlicom.java

@@ -21,9 +21,6 @@ import java.util.TimeZone;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.aliyun.mns.client.CloudAccount;
 import com.aliyun.mns.client.CloudQueue;
 import com.aliyun.mns.client.MNSClient;
@@ -36,6 +33,8 @@ import com.aliyuncs.http.MethodType;
 import com.aliyuncs.http.ProtocolType;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 获取接收云通信消息的临时token

spring-cloud-alicloud-sms/src/main/java/com/alibaba/alicloud/sms/config/SmsAutoConfiguration.java

@@ -15,12 +15,6 @@
  */
 package com.alibaba.alicloud.sms.config;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 import com.alibaba.alicloud.context.AliCloudProperties;
 import com.alibaba.alicloud.context.sms.SmsProperties;
 import com.alibaba.alicloud.sms.ISmsService;
@@ -29,6 +23,12 @@ import com.alibaba.alicloud.sms.SmsServiceImpl;
 
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
 /**
  * @author pbting
  */