polish #761 update pkg name & maven coordinate for Edgware

spring-cloud-alicloud-context/pom.xml

@@ -3,13 +3,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.springframework.cloud</groupId>
+        <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba</artifactId>
         <version>0.1.3.BUILD-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-alicloud-context</artifactId>
     <name>Spring Cloud AliCloud Context</name>
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context;
+package com.alibaba.alicloud.context;
 
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context;
+package com.alibaba.alicloud.context;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context;
+package com.alibaba.alicloud.context;
 
 /**
  * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.acm;
+package com.alibaba.alicloud.context.acm;
 
 import javax.annotation.PostConstruct;
 
@@ -22,15 +22,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alicloud.context.AliCloudProperties;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 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;
 
 /**
@@ -38,7 +38,7 @@ import com.alibaba.cloud.context.acm.AliCloudAcmInitializer;
  */
 @Configuration
 @EnableConfigurationProperties(AcmProperties.class)
-@ConditionalOnClass(name = "org.springframework.cloud.alicloud.acm.AcmAutoConfiguration")
+@ConditionalOnClass(name = "com.alibaba.alicloud.acm.AcmAutoConfiguration")
 @ImportAutoConfiguration(EdasContextAutoConfiguration.class)
 public class AcmContextBootstrapConfiguration {
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.acm;
+package com.alibaba.alicloud.context.acm;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.acm;
+package com.alibaba.alicloud.context.acm;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

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

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.ans;
+package com.alibaba.alicloud.context.ans;
 
-import org.springframework.cloud.alicloud.context.AliCloudProperties;
-import org.springframework.cloud.alicloud.context.edas.EdasProperties;
-import org.springframework.cloud.alicloud.context.listener.AbstractOnceApplicationListener;
 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;
 
@@ -35,7 +35,7 @@ public class AnsContextApplicationListener
 
 	@Override
 	protected String conditionalOnClass() {
-		return "org.springframework.cloud.alicloud.ans.AnsAutoConfiguration";
+		return "com.alibaba.alicloud.ans.AnsAutoConfiguration";
 	}
 
 	@Override

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

@@ -14,23 +14,24 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.ans;
+package com.alibaba.alicloud.context.ans;
 
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
 import org.springframework.cloud.commons.util.InetUtils;
 import org.springframework.cloud.commons.util.InetUtilsProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+
 /**
  * @author xiaolongzuo
  */
 @Configuration
-@ConditionalOnClass(name = "org.springframework.cloud.alicloud.ans.AnsAutoConfiguration")
+@ConditionalOnClass(name = "com.alibaba.alicloud.ans.AnsAutoConfiguration")
 @EnableConfigurationProperties({ AnsProperties.class })
 @ImportAutoConfiguration(EdasContextAutoConfiguration.class)
 public class AnsContextAutoConfiguration {

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

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

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

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.edas;
+package com.alibaba.alicloud.context.edas;
 
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.AliCloudProperties;
 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;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.edas;
+package com.alibaba.alicloud.context.edas;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.listener;
+package com.alibaba.alicloud.context.listener;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;

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

@@ -1,10 +1,10 @@
-package org.springframework.cloud.alicloud.context.nacos;
+package com.alibaba.alicloud.context.nacos;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
-import org.springframework.cloud.alicloud.context.listener.AbstractOnceApplicationListener;
 
+import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener;
 import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
 import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 
@@ -18,7 +18,7 @@ public class NacosConfigParameterInitListener
 
 	@Override
 	protected String conditionalOnClass() {
-		return "org.springframework.cloud.alibaba.nacos.NacosConfigAutoConfiguration";
+		return "com.alibaba.cloud.nacos.NacosConfigAutoConfiguration";
 	}
 
 	@Override

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

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alicloud.context.nacos;
+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 org.springframework.cloud.alicloud.context.listener.AbstractOnceApplicationListener;
 
+import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener;
 import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
 import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 
@@ -36,7 +36,7 @@ public class NacosDiscoveryParameterInitListener
 
 	@Override
 	protected String conditionalOnClass() {
-		return "org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration";
+		return "com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration";
 	}
 
 	@Override

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

@@ -14,21 +14,22 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.oss;
+package com.alibaba.alicloud.context.oss;
 
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 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.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.AliCloudProperties;
 import org.springframework.context.annotation.Bean;
 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;
 
@@ -39,7 +40,7 @@ import com.aliyun.oss.OSSClientBuilder;
  * @author xiaolongzuo
  */
 @Configuration
-@ConditionalOnClass(name = "org.springframework.cloud.alicloud.oss.OssAutoConfiguration")
+@ConditionalOnClass(name = "com.alibaba.alicloud.oss.OssAutoConfiguration")
 @ConditionalOnProperty(name = "spring.cloud.alicloud.oss.enabled", matchIfMissing = true)
 @EnableConfigurationProperties(OssProperties.class)
 @ImportAutoConfiguration(AliCloudContextAutoConfiguration.class)

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

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.oss;
+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;
 
 /**

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

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.scx;
+package com.alibaba.alicloud.context.scx;
 
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 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.cloud.alicloud.context.AliCloudProperties;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasProperties;
 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;
@@ -35,7 +35,7 @@ import com.alibaba.edas.schedulerx.SchedulerXClient;
  * @author xiaolongzuo
  */
 @Configuration
-@ConditionalOnClass(name = "org.springframework.cloud.alicloud.scx.ScxAutoConfiguration")
+@ConditionalOnClass(name = "com.alibaba.alicloud.scx.ScxAutoConfiguration")
 @ConditionalOnProperty(name = "spring.cloud.alicloud.scx.enabled", matchIfMissing = true)
 @EnableConfigurationProperties(ScxProperties.class)
 @ImportAutoConfiguration(EdasContextAutoConfiguration.class)

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.scx;
+package com.alibaba.alicloud.context.scx;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.alicloud.context.sms;
+package com.alibaba.alicloud.context.sms;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @EnableConfigurationProperties(SmsProperties.class)
 @ConditionalOnClass(name = "com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest")
-@ConditionalOnProperty(value = "spring.cloud.alibaba.deshao.enable.sms", matchIfMissing = true)
+@ConditionalOnProperty(value = "spring.cloud.alicloud.sms.enabled", matchIfMissing = true)
 public class SmsContextAutoConfiguration {
 
 }

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

@@ -1,4 +1,4 @@
-package org.springframework.cloud.alicloud.context.sms;
+package com.alibaba.alicloud.context.sms;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.statistics;
+package com.alibaba.alicloud.context.statistics;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,17 +22,17 @@ 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.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration;
-import org.springframework.cloud.alicloud.context.acm.AcmProperties;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
-import org.springframework.cloud.alicloud.context.edas.EdasProperties;
-import org.springframework.cloud.alicloud.context.oss.OssContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.oss.OssProperties;
-import org.springframework.cloud.alicloud.context.scx.ScxContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.scx.ScxProperties;
 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;
+import com.alibaba.alicloud.context.ans.AnsProperties;
+import com.alibaba.alicloud.context.edas.EdasProperties;
+import com.alibaba.alicloud.context.oss.OssContextAutoConfiguration;
+import com.alibaba.alicloud.context.oss.OssProperties;
+import com.alibaba.alicloud.context.scx.ScxContextAutoConfiguration;
+import com.alibaba.alicloud.context.scx.ScxProperties;
 import com.alibaba.cloud.context.AliCloudServerMode;
 import com.alibaba.cloud.context.edas.AliCloudEdasSdk;
 import com.alibaba.cloud.context.statistics.StatisticsTask;

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

@@ -1,14 +1,14 @@
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
-  org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration
+  com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration,\
-  org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration,\
-  org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration,\
-  org.springframework.cloud.alicloud.context.oss.OssContextAutoConfiguration,\
-  org.springframework.cloud.alicloud.context.scx.ScxContextAutoConfiguration,\
-  org.springframework.cloud.alicloud.context.statistics.StatisticsTaskStarter,\
-  org.springframework.cloud.alicloud.context.sms.SmsContextAutoConfiguration
+  com.alibaba.alicloud.context.AliCloudContextAutoConfiguration,\
+  com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration,\
+  com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration,\
+  com.alibaba.alicloud.context.oss.OssContextAutoConfiguration,\
+  com.alibaba.alicloud.context.scx.ScxContextAutoConfiguration,\
+  com.alibaba.alicloud.context.statistics.StatisticsTaskStarter,\
+  com.alibaba.alicloud.context.sms.SmsContextAutoConfiguration
 org.springframework.context.ApplicationListener=\
-  org.springframework.cloud.alicloud.context.ans.AnsContextApplicationListener,\
-  org.springframework.cloud.alicloud.context.nacos.NacosConfigParameterInitListener,\
-  org.springframework.cloud.alicloud.context.nacos.NacosDiscoveryParameterInitListener
+  com.alibaba.alicloud.context.ans.AnsContextApplicationListener,\
+  com.alibaba.alicloud.context.nacos.NacosConfigParameterInitListener,\
+  com.alibaba.alicloud.context.nacos.NacosDiscoveryParameterInitListener

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.acm;
+package com.alibaba.alicloud.acm;
 
 /**
  * @author xiaolongzuo

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
 
 /**
  * @author xiaolongzuo

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context;
+package com.alibaba.alicloud.context;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,10 +22,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+
 /**
  * @author xiaolongzuo
  */

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context;
+package com.alibaba.alicloud.context;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,10 +22,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+
 /**
  * @author xiaolongzuo
  */

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context;
+package com.alibaba.alicloud.context;
 
 import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.acm;
+package com.alibaba.alicloud.context.acm;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,27 +22,31 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+
 /**
  * @author xiaolongzuo
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { AliCloudContextAutoConfiguration.class,
-		EdasContextAutoConfiguration.class, AnsContextAutoConfiguration.class,AcmContextBootstrapConfiguration.class }, properties = {
-		"spring.application.name=myapp", "spring.application.group=com.alicloud.test",
-		"spring.profiles.active=profile1,profile2", "spring.cloud.alicloud.access-key=ak",
-		"spring.cloud.alicloud.secret-key=sk",
-		"spring.cloud.alicloud.acm.server-mode=EDAS",
-		"spring.cloud.alicloud.acm.server-port=11111",
-		"spring.cloud.alicloud.acm.server-list=10.10.10.10",
-		"spring.cloud.alicloud.acm.namespace=testNamespace",
-		"spring.cloud.alicloud.acm.endpoint=testDomain",
-		"spring.cloud.alicloud.acm.group=testGroup",
-		"spring.cloud.alicloud.acm.file-extension=yaml" })
+		EdasContextAutoConfiguration.class, AnsContextAutoConfiguration.class,
+		AcmContextBootstrapConfiguration.class }, properties = {
+				"spring.application.name=myapp",
+				"spring.application.group=com.alicloud.test",
+				"spring.profiles.active=profile1,profile2",
+				"spring.cloud.alicloud.access-key=ak",
+				"spring.cloud.alicloud.secret-key=sk",
+				"spring.cloud.alicloud.acm.server-mode=EDAS",
+				"spring.cloud.alicloud.acm.server-port=11111",
+				"spring.cloud.alicloud.acm.server-list=10.10.10.10",
+				"spring.cloud.alicloud.acm.namespace=testNamespace",
+				"spring.cloud.alicloud.acm.endpoint=testDomain",
+				"spring.cloud.alicloud.acm.group=testGroup",
+				"spring.cloud.alicloud.acm.file-extension=yaml" })
 public class AcmIntegrationPropertiesLoad2Tests {
 
 	@Autowired

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.acm;
+package com.alibaba.alicloud.context.acm;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,11 +22,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+
 /**
  * @author xiaolongzuo
  */

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.acm;
+package com.alibaba.alicloud.context.acm;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,11 +22,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
 import com.alibaba.cloud.context.AliCloudServerMode;
 
 /**

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.acm;
+package com.alibaba.alicloud.context.acm;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,11 +22,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
 import com.alibaba.cloud.context.AliCloudServerMode;
 
 /**

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

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.ans;
+package com.alibaba.alicloud.context.ans;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
-import org.springframework.cloud.alicloud.context.BaseAliCloudSpringApplication;
+
+import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
 
 /**
  * @author xiaolongzuo

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.ans;
+package com.alibaba.alicloud.context.ans;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,8 +22,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import com.alibaba.cloud.context.AliCloudServerMode;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.ans;
+package com.alibaba.alicloud.context.ans;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,15 +28,16 @@ import org.powermock.modules.junit4.PowerMockRunnerDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
 import com.alibaba.cloud.context.AliCloudServerMode;
 import com.alibaba.cloud.context.ans.AliCloudAnsInitializer;
 import com.alibaba.cloud.context.edas.AliCloudEdasSdk;
+
 import com.aliyuncs.edas.model.v20170801.GetSecureTokenResponse;
 import com.aliyuncs.edas.model.v20170801.InsertApplicationResponse;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.edas;
+package com.alibaba.alicloud.context.edas;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,10 +22,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
+
 /**
  * @author xiaolongzuo
  */

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.edas;
+package com.alibaba.alicloud.context.edas;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,10 +22,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
+
 /**
  * @author xiaolongzuo
  */

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.edas;
+package com.alibaba.alicloud.context.edas;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,10 +22,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
+
 /**
  * @author xiaolongzuo
  */

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

@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.nacos;
+package com.alibaba.alicloud.context.nacos;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
-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 org.springframework.cloud.alicloud.context.BaseAliCloudSpringApplication;
-import org.springframework.cloud.alicloud.utils.ChangeOrderUtils;
 
-import static org.assertj.core.api.Assertions.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;
 
 /**
  * @author xiaolongzuo

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

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.nacos;
+package com.alibaba.alicloud.context.nacos;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.springframework.cloud.alicloud.context.BaseAliCloudSpringApplication;
-import org.springframework.cloud.alicloud.utils.ChangeOrderUtils;
 
+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;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.oss;
+package com.alibaba.alicloud.context.oss;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,12 +22,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.AliCloudProperties;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.AliCloudProperties;
+import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+
 import com.aliyun.oss.OSSClient;
 
 /**

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.scx;
+package com.alibaba.alicloud.context.scx;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,12 +22,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasProperties;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasProperties;
+
 /**
  * @author xiaolongzuo
  */

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

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.sms;
+package com.alibaba.alicloud.context.sms;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.alicloud.context.BaseAliCloudSpringApplication;
+
+import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
 
 /**
  * @author xiaolongzuo

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.context.sms;
+package com.alibaba.alicloud.context.sms;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,11 +22,12 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+
 /**
  * @author xiaolongzuo
  */

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.oss;
+package com.alibaba.alicloud.oss;
 
 /**
  * @author xiaolongzuo

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.scx;
+package com.alibaba.alicloud.scx;
 
 /**
  * @author xiaolongzuo

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alicloud.utils;
+package com.alibaba.alicloud.utils;
 
 import org.powermock.api.mockito.PowerMockito;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
 
 /**
  * @author xiaolongzuo

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
 
 /**
  * @author xiaolongzuo