study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

#734 -> update pkg name

Browse Source
This commit is contained in:
fangjian0423
2019-07-08 22:42:08 +08:00
parent aa03ddbbe2
commit 52ac888164
477 changed files with 1584 additions and 1259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
View File

@@ -14,13 +14,14 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos;
package com.alibaba.cloud.nacos;
import com.alibaba.cloud.nacos.refresh.NacosContextRefresher;
import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
import com.alibaba.cloud.nacos.refresh.NacosRefreshProperties;
import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.alibaba.nacos.refresh.NacosContextRefresher;
import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshHistory;
import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

5
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfiguration.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java
View File

@@ -14,11 +14,12 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos;
package com.alibaba.cloud.nacos;
import com.alibaba.cloud.nacos.client.NacosPropertySourceLocator;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.alibaba.nacos.client.NacosPropertySourceLocator;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

2
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosConfigProperties.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos;
package com.alibaba.cloud.nacos;
import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.config.ConfigService;

5
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosPropertySourceRepository.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java
View File

@@ -14,14 +14,15 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos;
package com.alibaba.cloud.nacos;
import org.springframework.cloud.alibaba.nacos.client.NacosPropertySource;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import com.alibaba.cloud.nacos.client.NacosPropertySource;
/**
* @author xiaojing
* @author pbting

2
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySource.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySource.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.client;
package com.alibaba.cloud.nacos.client;
import org.springframework.core.env.MapPropertySource;

4
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceBuilder.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceBuilder.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.client;
package com.alibaba.cloud.nacos.client;
import com.alibaba.cloud.nacos.NacosPropertySourceRepository;
import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.exception.NacosException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
import org.springframework.cloud.alibaba.nacos.NacosPropertySourceRepository;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.util.StringUtils;

8
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.client;
package com.alibaba.cloud.nacos.client;
import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.cloud.nacos.NacosPropertySourceRepository;
import com.alibaba.cloud.nacos.refresh.NacosContextRefresher;
import com.alibaba.nacos.api.config.ConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
import org.springframework.cloud.alibaba.nacos.NacosPropertySourceRepository;
import org.springframework.cloud.alibaba.nacos.refresh.NacosContextRefresher;
import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
import org.springframework.core.annotation.Order;
import org.springframework.core.env.CompositePropertySource;

2
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/diagnostics/analyzer/NacosConnectionFailureAnalyzer.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureAnalyzer.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.diagnostics.analyzer;
package com.alibaba.cloud.nacos.diagnostics.analyzer;
import org.springframework.boot.diagnostics.AbstractFailureAnalyzer;
import org.springframework.boot.diagnostics.FailureAnalysis;

2
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/diagnostics/analyzer/NacosConnectionFailureException.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureException.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.diagnostics.analyzer;
package com.alibaba.cloud.nacos.diagnostics.analyzer;
/**
* A {@code NacosConnectionFailureException} is thrown when the application fails to connect

11
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpoint.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpoint.java
View File

@@ -14,14 +14,10 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.endpoint;
package com.alibaba.cloud.nacos.endpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
import org.springframework.cloud.alibaba.nacos.NacosPropertySourceRepository;
import org.springframework.cloud.alibaba.nacos.client.NacosPropertySource;
import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshHistory;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -30,6 +26,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.cloud.nacos.NacosPropertySourceRepository;
import com.alibaba.cloud.nacos.client.NacosPropertySource;
import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
/**
* Endpoint for Nacos, contains config data and refresh history
* @author xiaojing

7
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java
View File

@@ -14,7 +14,10 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.endpoint;
package com.alibaba.cloud.nacos.endpoint;
import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
@@ -23,8 +26,6 @@ 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.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshHistory;
import org.springframework.context.annotation.Bean;
/**

8
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigHealthIndicator.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.endpoint;
package com.alibaba.cloud.nacos.endpoint;
import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.cloud.nacos.NacosPropertySourceRepository;
import com.alibaba.cloud.nacos.client.NacosPropertySource;
import com.alibaba.nacos.api.config.ConfigService;
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
import org.springframework.boot.actuate.health.Health;
import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
import org.springframework.cloud.alibaba.nacos.NacosPropertySourceRepository;
import org.springframework.cloud.alibaba.nacos.client.NacosPropertySource;
import org.springframework.util.StringUtils;
import java.util.ArrayList;

6
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosContextRefresher.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/refresh/NacosContextRefresher.java
View File

@@ -14,8 +14,10 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.refresh;
package com.alibaba.cloud.nacos.refresh;
import com.alibaba.cloud.nacos.NacosPropertySourceRepository;
import com.alibaba.cloud.nacos.client.NacosPropertySource;
import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.config.listener.Listener;
import com.alibaba.nacos.api.exception.NacosException;
@@ -23,8 +25,6 @@ import com.alibaba.nacos.api.exception.NacosException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.cloud.alibaba.nacos.NacosPropertySourceRepository;
import org.springframework.cloud.alibaba.nacos.client.NacosPropertySource;
import org.springframework.cloud.endpoint.event.RefreshEvent;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;

2
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosRefreshHistory.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshHistory.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.refresh;
package com.alibaba.cloud.nacos.refresh;
import java.text.DateFormat;
import java.text.SimpleDateFormat;

2
alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosRefreshProperties.java → alibaba-nacos-config-spring-cloud/src/main/java/com/alibaba/cloud/nacos/refresh/NacosRefreshProperties.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.refresh;
package com.alibaba.cloud.nacos.refresh;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

8
alibaba-nacos-config-spring-cloud/src/main/resources/META-INF/spring.factories
View File

@@ -1,7 +1,7 @@
org.springframework.cloud.bootstrap.BootstrapConfiguration=\
org.springframework.cloud.alibaba.nacos.NacosConfigBootstrapConfiguration
com.alibaba.cloud.nacos.NacosConfigBootstrapConfiguration
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.cloud.alibaba.nacos.NacosConfigAutoConfiguration,\
org.springframework.cloud.alibaba.nacos.endpoint.NacosConfigEndpointAutoConfiguration
com.alibaba.cloud.nacos.NacosConfigAutoConfiguration,\
com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration
org.springframework.boot.diagnostics.FailureAnalyzer=\
org.springframework.cloud.alibaba.nacos.diagnostics.analyzer.NacosConnectionFailureAnalyzer
com.alibaba.cloud.nacos.diagnostics.analyzer.NacosConnectionFailureAnalyzer

9
alibaba-nacos-config-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationExtConfigTests.java → alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/NacosConfigurationExtConfigTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos;
package com.alibaba.alibaba.nacos;
import static org.junit.Assert.assertNotNull;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
@@ -22,6 +22,11 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import com.alibaba.cloud.nacos.NacosConfigAutoConfiguration;
import com.alibaba.cloud.nacos.NacosConfigBootstrapConfiguration;
import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.cloud.nacos.client.NacosPropertySourceLocator;
import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
import com.alibaba.nacos.client.config.NacosConfigService;
import org.junit.Assert;
@@ -37,8 +42,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.alibaba.nacos.client.NacosPropertySourceLocator;
import org.springframework.cloud.alibaba.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;

13
alibaba-nacos-config-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationTests.java → alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/NacosConfigurationTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos;
package com.alibaba.alibaba.nacos;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -37,14 +37,17 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.alibaba.nacos.client.NacosPropertySourceLocator;
import org.springframework.cloud.alibaba.nacos.endpoint.NacosConfigEndpoint;
import org.springframework.cloud.alibaba.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshHistory;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;
import com.alibaba.cloud.nacos.NacosConfigAutoConfiguration;
import com.alibaba.cloud.nacos.NacosConfigBootstrapConfiguration;
import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.cloud.nacos.client.NacosPropertySourceLocator;
import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpoint;
import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
import com.alibaba.nacos.client.config.NacosConfigService;
/**

6
alibaba-nacos-config-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosFileExtensionTest.java → alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/NacosFileExtensionTest.java
View File

@@ -14,13 +14,16 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos;
package com.alibaba.alibaba.nacos;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import com.alibaba.cloud.nacos.NacosConfigAutoConfiguration;
import com.alibaba.cloud.nacos.NacosConfigBootstrapConfiguration;
import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
import com.alibaba.nacos.client.config.NacosConfigService;
import org.junit.Assert;
@@ -36,7 +39,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.alibaba.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;

57
alibaba-nacos-config-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointTests.java → alibaba-nacos-config-spring-cloud/src/test/java/com/alibaba/alibaba/nacos/endpoint/NacosConfigEndpointTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.endpoint;
package com.alibaba.alibaba.nacos.endpoint;
import static org.junit.Assert.assertEquals;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
@@ -25,6 +25,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import com.alibaba.cloud.nacos.NacosConfigAutoConfiguration;
import com.alibaba.cloud.nacos.NacosConfigBootstrapConfiguration;
import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpoint;
import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
import com.alibaba.cloud.nacos.endpoint.NacosConfigHealthIndicator;
import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
import com.alibaba.nacos.client.config.NacosConfigService;
import org.junit.Assert;
@@ -41,10 +48,6 @@ import org.springframework.boot.actuate.health.Health.Builder;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.alibaba.nacos.NacosConfigAutoConfiguration;
import org.springframework.cloud.alibaba.nacos.NacosConfigBootstrapConfiguration;
import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshHistory;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
@@ -98,31 +101,31 @@ public class NacosConfigEndpointTests {
public void contextLoads() throws Exception {
checkoutEndpoint();
checkoutAcmHealthIndicator();
//checkoutAcmHealthIndicator();
}
private void checkoutAcmHealthIndicator() {
try {
Builder builder = new Builder();
NacosConfigHealthIndicator healthIndicator = new NacosConfigHealthIndicator(
properties, properties.configServiceInstance());
healthIndicator.doHealthCheck(builder);
Builder builder1 = new Builder();
List<String> dataIds = new ArrayList<>();
dataIds.add("test-name.properties");
builder1.up().withDetail("dataIds", dataIds);
Assert.assertTrue(builder.build().equals(builder1.build()));
}
catch (Exception ignoreE) {
}
}
//private void checkoutAcmHealthIndicator() {
// try {
// Builder builder = new Builder();
//
// NacosConfigHealthIndicator healthIndicator = new NacosConfigHealthIndicator(
// properties, properties.configServiceInstance());
// healthIndicator.doHealthCheck(builder);
//
// Builder builder1 = new Builder();
// List<String> dataIds = new ArrayList<>();
// dataIds.add("test-name.properties");
// builder1.up().withDetail("dataIds", dataIds);
//
// Assert.assertTrue(builder.build().equals(builder1.build()));
//
// }
// catch (Exception ignoreE) {
//
// }
//
//}
private void checkoutEndpoint() throws Exception {
NacosConfigEndpoint endpoint = new NacosConfigEndpoint(properties,