diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index be233bcce..8fc04cea2 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -16,7 +16,7 @@
Spring Cloud Alibaba Dependencies
- 0.1.1
+ 0.2.0
3.1.0
0.2.1
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/JsonFlowRuleListParser.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/JsonFlowRuleListParser.java
index 255eb7892..b205c96c5 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/JsonFlowRuleListParser.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/JsonFlowRuleListParser.java
@@ -2,7 +2,7 @@ package org.springframework.cloud.alibaba.cloud.examples;
import java.util.List;
-import com.alibaba.csp.sentinel.datasource.ConfigParser;
+import com.alibaba.csp.sentinel.datasource.Converter;
import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
@@ -10,9 +10,10 @@ import com.alibaba.fastjson.TypeReference;
/**
* @author fangjian
*/
-public class JsonFlowRuleListParser implements ConfigParser> {
+public class JsonFlowRuleListParser implements Converter> {
@Override
- public List parse(String source) {
- return JSON.parseObject(source, new TypeReference>() {});
+ public List convert(String source) {
+ return JSON.parseObject(source, new TypeReference>() {
+ });
}
}
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ServiceApplication.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ServiceApplication.java
index c9df5fc78..8ced5aff1 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ServiceApplication.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ServiceApplication.java
@@ -6,7 +6,7 @@ import org.springframework.cloud.alibaba.sentinel.annotation.SentinelProtect;
import org.springframework.context.annotation.Bean;
import org.springframework.web.client.RestTemplate;
-import com.alibaba.csp.sentinel.datasource.ConfigParser;
+import com.alibaba.csp.sentinel.datasource.Converter;
/**
* @author xiaojing
@@ -26,7 +26,7 @@ public class ServiceApplication {
}
@Bean
- public ConfigParser myParser() {
+ public Converter myParser() {
return new JsonFlowRuleListParser();
}
diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourceLoader.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourceLoader.java
index 183477cb5..235a2163e 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourceLoader.java
+++ b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourceLoader.java
@@ -34,118 +34,119 @@ import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
-import com.alibaba.csp.sentinel.datasource.DataSource;
+import com.alibaba.csp.sentinel.datasource.ReadableDataSource;
/**
- * {@link DataSource} Loader
+ * {@link ReadableDataSource} Loader
*
* @author fangjian
*/
public class DataSourceLoader {
- private static final Logger logger = LoggerFactory.getLogger(DataSourceLoader.class);
+ private static final Logger logger = LoggerFactory.getLogger(DataSourceLoader.class);
- private final static String PROPERTIES_RESOURCE_LOCATION = "META-INF/sentinel-datasource.properties";
+ private final static String PROPERTIES_RESOURCE_LOCATION = "META-INF/sentinel-datasource.properties";
- private final static String ALL_PROPERTIES_RESOURCES_LOCATION = CLASSPATH_ALL_URL_PREFIX
- + PROPERTIES_RESOURCE_LOCATION;
+ private final static String ALL_PROPERTIES_RESOURCES_LOCATION = CLASSPATH_ALL_URL_PREFIX
+ + PROPERTIES_RESOURCE_LOCATION;
- private final static ConcurrentMap> dataSourceClassesCache = new ConcurrentHashMap>(
- 4);
+ private final static ConcurrentMap> dataSourceClassesCache = new ConcurrentHashMap>(
+ 4);
- static void loadAllDataSourceClassesCache() {
- Map> dataSourceClassesMap = loadAllDataSourceClassesCache(
- ALL_PROPERTIES_RESOURCES_LOCATION);
+ static void loadAllDataSourceClassesCache() {
+ Map> dataSourceClassesMap = loadAllDataSourceClassesCache(
+ ALL_PROPERTIES_RESOURCES_LOCATION);
- dataSourceClassesCache.putAll(dataSourceClassesMap);
- }
+ dataSourceClassesCache.putAll(dataSourceClassesMap);
+ }
- static Map> loadAllDataSourceClassesCache(
- String resourcesLocation) {
+ static Map> loadAllDataSourceClassesCache(
+ String resourcesLocation) {
- Map> dataSourcesMap = new HashMap>(
- 4);
+ Map> dataSourcesMap = new HashMap>(
+ 4);
- ClassLoader classLoader = DataSourceLoader.class.getClassLoader();
+ ClassLoader classLoader = DataSourceLoader.class.getClassLoader();
- ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+ ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
- try {
+ try {
- Resource[] resources = resolver.getResources(resourcesLocation);
+ Resource[] resources = resolver.getResources(resourcesLocation);
- for (Resource resource : resources) {
- if (resource.exists()) {
- Properties properties = PropertiesLoaderUtils
- .loadProperties(resource);
- for (Map.Entry