update sentinel version to 0.2.0

spring-cloud-alibaba-dependencies/pom.xml

@@ -16,7 +16,7 @@
     <description>Spring Cloud Alibaba Dependencies</description>
 
     <properties>
-        <sentinel.version>0.1.1</sentinel.version>
+        <sentinel.version>0.2.0</sentinel.version>
         <oss.version>3.1.0</oss.version>
         <nacos.version>0.2.1</nacos.version>
     </properties>

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<String, List<FlowRule>> {
+public class JsonFlowRuleListParser implements Converter<String, List<FlowRule>> {
 	@Override
-	public List<FlowRule> parse(String source) {
-		return JSON.parseObject(source, new TypeReference<List<FlowRule>>() {});
+	public List<FlowRule> convert(String source) {
+		return JSON.parseObject(source, new TypeReference<List<FlowRule>>() {
+		});
 	}
 }

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();
 	}
 

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<String, Class<? extends DataSource>> dataSourceClassesCache = new ConcurrentHashMap<String, Class<? extends DataSource>>(
-            4);
+	private final static ConcurrentMap<String, Class<? extends ReadableDataSource>> dataSourceClassesCache = new ConcurrentHashMap<String, Class<? extends ReadableDataSource>>(
+			4);
 
-    static void loadAllDataSourceClassesCache() {
-        Map<String, Class<? extends DataSource>> dataSourceClassesMap = loadAllDataSourceClassesCache(
-                ALL_PROPERTIES_RESOURCES_LOCATION);
+	static void loadAllDataSourceClassesCache() {
+		Map<String, Class<? extends ReadableDataSource>> dataSourceClassesMap = loadAllDataSourceClassesCache(
+				ALL_PROPERTIES_RESOURCES_LOCATION);
 
-        dataSourceClassesCache.putAll(dataSourceClassesMap);
-    }
+		dataSourceClassesCache.putAll(dataSourceClassesMap);
+	}
 
-    static Map<String, Class<? extends DataSource>> loadAllDataSourceClassesCache(
-            String resourcesLocation) {
+	static Map<String, Class<? extends ReadableDataSource>> loadAllDataSourceClassesCache(
+			String resourcesLocation) {
 
-        Map<String, Class<? extends DataSource>> dataSourcesMap = new HashMap<String, Class<? extends DataSource>>(
-                4);
+		Map<String, Class<? extends ReadableDataSource>> dataSourcesMap = new HashMap<String, Class<? extends ReadableDataSource>>(
+				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<Object, Object> entry : properties.entrySet()) {
+			for (Resource resource : resources) {
+				if (resource.exists()) {
+					Properties properties = PropertiesLoaderUtils
+							.loadProperties(resource);
+					for (Map.Entry<Object, Object> entry : properties.entrySet()) {
 
-                        String type = (String) entry.getKey();
-                        String className = (String) entry.getValue();
+						String type = (String) entry.getKey();
+						String className = (String) entry.getValue();
 
-                        if (!ClassUtils.isPresent(className, classLoader)) {
-                            if (logger.isDebugEnabled()) {
-                                logger.debug(
-                                        "Sentinel DataSource implementation [ type : "
-                                                + type + ": , class : " + className
-                                                + " , url : " + resource.getURL()
-                                                + "] was not present in current classpath , "
-                                                + "thus loading will be ignored , please add dependency if required !");
-                            }
-                            continue;
-                        }
+						if (!ClassUtils.isPresent(className, classLoader)) {
+							if (logger.isDebugEnabled()) {
+								logger.debug(
+										"Sentinel DataSource implementation [ type : "
+												+ type + ": , class : " + className
+												+ " , url : " + resource.getURL()
+												+ "] was not present in current classpath , "
+												+ "thus loading will be ignored , please add dependency if required !");
+							}
+							continue;
+						}
 
-                        Assert.isTrue(!dataSourcesMap.containsKey(type),
-                                "The duplicated type[" + type
-                                        + "] of SentinelDataSource were found in "
-                                        + "resource [" + resource.getURL() + "]");
+						Assert.isTrue(!dataSourcesMap.containsKey(type),
+								"The duplicated type[" + type
+										+ "] of SentinelDataSource were found in "
+										+ "resource [" + resource.getURL() + "]");
 
-                        Class<?> dataSourceClass = ClassUtils.resolveClassName(className,
-                                classLoader);
-                        Assert.isAssignable(DataSource.class, dataSourceClass);
+						Class<?> dataSourceClass = ClassUtils.resolveClassName(className,
+								classLoader);
+						Assert.isAssignable(ReadableDataSource.class, dataSourceClass);
 
-                        dataSourcesMap.put(type,
-                                (Class<? extends DataSource>) dataSourceClass);
+						dataSourcesMap.put(type,
+								(Class<? extends ReadableDataSource>) dataSourceClass);
 
-                        if (logger.isDebugEnabled()) {
-                            logger.debug("Sentinel DataSource implementation [ type : "
-                                    + type + ": , class : " + className
-                                    + "] was loaded.");
-                        }
-                    }
-                }
-            }
+						if (logger.isDebugEnabled()) {
+							logger.debug("Sentinel DataSource implementation [ type : "
+									+ type + ": , class : " + className
+									+ "] was loaded.");
+						}
+					}
+				}
+			}
 
-        }
-        catch (IOException e) {
-            if (logger.isErrorEnabled()) {
-                logger.error(e.getMessage(), e);
-            }
-        }
+		}
+		catch (IOException e) {
+			if (logger.isErrorEnabled()) {
+				logger.error(e.getMessage(), e);
+			}
+		}
 
-        return dataSourcesMap;
-    }
+		return dataSourcesMap;
+	}
 
-    public static Class<? extends DataSource> loadClass(String type)
-            throws IllegalArgumentException {
+	public static Class<? extends ReadableDataSource> loadClass(String type)
+			throws IllegalArgumentException {
 
-        Class<? extends DataSource> dataSourceClass = dataSourceClassesCache.get(type);
+		Class<? extends ReadableDataSource> dataSourceClass = dataSourceClassesCache
+				.get(type);
 
-        if (dataSourceClass == null) {
-            if (dataSourceClassesCache.isEmpty()) {
-                loadAllDataSourceClassesCache();
-                dataSourceClass = dataSourceClassesCache.get(type);
-            }
-        }
+		if (dataSourceClass == null) {
+			if (dataSourceClassesCache.isEmpty()) {
+				loadAllDataSourceClassesCache();
+				dataSourceClass = dataSourceClassesCache.get(type);
+			}
+		}
 
-        if (dataSourceClass == null) {
-            throw new IllegalArgumentException(
-                    "Sentinel DataSource implementation [ type : " + type
-                            + " ] can't be found!");
-        }
+		if (dataSourceClass == null) {
+			throw new IllegalArgumentException(
+					"Sentinel DataSource implementation [ type : " + type
+							+ " ] can't be found!");
+		}
 
-        return dataSourceClass;
+		return dataSourceClass;
 
-    }
+	}
 
 }

spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourcePostProcessor.java

@@ -44,174 +44,174 @@ import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
-import com.alibaba.csp.sentinel.datasource.ConfigParser;
+import com.alibaba.csp.sentinel.datasource.Converter;
 
 /**
  * {@link SentinelDataSource @SentinelDataSource} Post Processor
  *
  * @author fangjian
- * @see com.alibaba.csp.sentinel.datasource.DataSource
+ * @see com.alibaba.csp.sentinel.datasource.ReadableDataSource
  * @see SentinelDataSource
  */
 public class SentinelDataSourcePostProcessor
-        extends InstantiationAwareBeanPostProcessorAdapter
-        implements MergedBeanDefinitionPostProcessor {
+		extends InstantiationAwareBeanPostProcessorAdapter
+		implements MergedBeanDefinitionPostProcessor {
 
-    private static final Logger logger = LoggerFactory
-            .getLogger(SentinelDataSourcePostProcessor.class);
+	private static final Logger logger = LoggerFactory
+			.getLogger(SentinelDataSourcePostProcessor.class);
 
-    @Autowired
-    private ApplicationContext applicationContext;
+	@Autowired
+	private ApplicationContext applicationContext;
 
-    @Autowired
-    private ConfigurableEnvironment environment;
+	@Autowired
+	private ConfigurableEnvironment environment;
 
-    private final Map<String, List<SentinelDataSourceField>> dataSourceFieldCache = new ConcurrentHashMap<>(
-            64);
+	private final Map<String, List<SentinelDataSourceField>> dataSourceFieldCache = new ConcurrentHashMap<>(
+			64);
 
-    @Override
-    public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition,
-                                                Class<?> beanType, final String beanName) {
-        // find all fields using by @SentinelDataSource annotation
-        ReflectionUtils.doWithFields(beanType, new ReflectionUtils.FieldCallback() {
-            @Override
-            public void doWith(Field field)
-                    throws IllegalArgumentException, IllegalAccessException {
-                SentinelDataSource annotation = getAnnotation(field,
-                        SentinelDataSource.class);
-                if (annotation != null) {
-                    if (Modifier.isStatic(field.getModifiers())) {
-                        if (logger.isWarnEnabled()) {
-                            logger.warn(
-                                    "@SentinelDataSource annotation is not supported on static fields: "
-                                            + field);
-                        }
-                        return;
-                    }
-                    if (dataSourceFieldCache.containsKey(beanName)) {
-                        dataSourceFieldCache.get(beanName)
-                                .add(new SentinelDataSourceField(annotation, field));
-                    }
-                    else {
-                        List<SentinelDataSourceField> list = new ArrayList<>();
-                        list.add(new SentinelDataSourceField(annotation, field));
-                        dataSourceFieldCache.put(beanName, list);
-                    }
-                }
-            }
-        });
-    }
+	@Override
+	public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition,
+			Class<?> beanType, final String beanName) {
+		// find all fields using by @SentinelDataSource annotation
+		ReflectionUtils.doWithFields(beanType, new ReflectionUtils.FieldCallback() {
+			@Override
+			public void doWith(Field field)
+					throws IllegalArgumentException, IllegalAccessException {
+				SentinelDataSource annotation = getAnnotation(field,
+						SentinelDataSource.class);
+				if (annotation != null) {
+					if (Modifier.isStatic(field.getModifiers())) {
+						if (logger.isWarnEnabled()) {
+							logger.warn(
+									"@SentinelDataSource annotation is not supported on static fields: "
+											+ field);
+						}
+						return;
+					}
+					if (dataSourceFieldCache.containsKey(beanName)) {
+						dataSourceFieldCache.get(beanName)
+								.add(new SentinelDataSourceField(annotation, field));
+					}
+					else {
+						List<SentinelDataSourceField> list = new ArrayList<>();
+						list.add(new SentinelDataSourceField(annotation, field));
+						dataSourceFieldCache.put(beanName, list);
+					}
+				}
+			}
+		});
+	}
 
-    @Override
-    public PropertyValues postProcessPropertyValues(PropertyValues pvs,
-                                                    PropertyDescriptor[] pds, Object bean, String beanName)
-            throws BeanCreationException {
-        if (dataSourceFieldCache.containsKey(beanName)) {
-            List<SentinelDataSourceField> sentinelDataSourceFields = dataSourceFieldCache
-                    .get(beanName);
-            for(SentinelDataSourceField sentinelDataSourceField : sentinelDataSourceFields) {
-                try {
-                    // construct DataSource field annotated by @SentinelDataSource
-                    Field field = sentinelDataSourceField.getField();
-                    ReflectionUtils.makeAccessible(field);
-                    String dataSourceBeanName = constructDataSource(
-                            sentinelDataSourceField.getSentinelDataSource());
-                    field.set(bean, applicationContext.getBean(dataSourceBeanName));
-                }
-                catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                }
-                catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return pvs;
-    }
+	@Override
+	public PropertyValues postProcessPropertyValues(PropertyValues pvs,
+			PropertyDescriptor[] pds, Object bean, String beanName)
+			throws BeanCreationException {
+		if (dataSourceFieldCache.containsKey(beanName)) {
+			List<SentinelDataSourceField> sentinelDataSourceFields = dataSourceFieldCache
+					.get(beanName);
+			for (SentinelDataSourceField sentinelDataSourceField : sentinelDataSourceFields) {
+				try {
+					// construct DataSource field annotated by @SentinelDataSource
+					Field field = sentinelDataSourceField.getField();
+					ReflectionUtils.makeAccessible(field);
+					String dataSourceBeanName = constructDataSource(
+							sentinelDataSourceField.getSentinelDataSource());
+					field.set(bean, applicationContext.getBean(dataSourceBeanName));
+				}
+				catch (IllegalAccessException e) {
+					e.printStackTrace();
+				}
+				catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return pvs;
+	}
 
-    private String constructDataSource(SentinelDataSource annotation) {
-        String prefix = annotation.value();
-        if (StringUtils.isEmpty(prefix)) {
-            prefix = SentinelConstants.PROPERTY_DATASOURCE_PREFIX;
-        }
-        Map<String, Object> propertyMap = PropertySourcesUtils
-                .getSubProperties(environment.getPropertySources(), prefix);
-        String alias = propertyMap.get("type").toString();
-        Class dataSourceClass = DataSourceLoader.loadClass(alias);
+	private String constructDataSource(SentinelDataSource annotation) {
+		String prefix = annotation.value();
+		if (StringUtils.isEmpty(prefix)) {
+			prefix = SentinelConstants.PROPERTY_DATASOURCE_PREFIX;
+		}
+		Map<String, Object> propertyMap = PropertySourcesUtils
+				.getSubProperties(environment.getPropertySources(), prefix);
+		String alias = propertyMap.get("type").toString();
+		Class dataSourceClass = DataSourceLoader.loadClass(alias);
 
-        String beanName = StringUtils.isEmpty(annotation.name())
-                ? StringUtils.uncapitalize(dataSourceClass.getSimpleName()) + "_" + prefix
-                : annotation.name();
-        if (applicationContext.containsBean(beanName)) {
-            return beanName;
-        }
+		String beanName = StringUtils.isEmpty(annotation.name())
+				? StringUtils.uncapitalize(dataSourceClass.getSimpleName()) + "_" + prefix
+				: annotation.name();
+		if (applicationContext.containsBean(beanName)) {
+			return beanName;
+		}
 
-        Class targetClass = null;
-        // if alias exists in SentinelDataSourceRegistry, wired properties into
-        // FactoryBean
-        if (SentinelDataSourceRegistry.checkFactoryBean(alias)) {
-            targetClass = SentinelDataSourceRegistry.getFactoryBean(alias);
-        }
-        else {
-            // if alias not exists in SentinelDataSourceRegistry, wired properties into
-            // raw class
-            targetClass = dataSourceClass;
-        }
+		Class targetClass = null;
+		// if alias exists in SentinelDataSourceRegistry, wired properties into
+		// FactoryBean
+		if (SentinelDataSourceRegistry.checkFactoryBean(alias)) {
+			targetClass = SentinelDataSourceRegistry.getFactoryBean(alias);
+		}
+		else {
+			// if alias not exists in SentinelDataSourceRegistry, wired properties into
+			// raw class
+			targetClass = dataSourceClass;
+		}
 
-        registerDataSource(beanName, targetClass, propertyMap);
+		registerDataSource(beanName, targetClass, propertyMap);
 
-        return beanName;
-    }
+		return beanName;
+	}
 
-    private void registerDataSource(String beanName, Class targetClass,
-                                    Map<String, Object> propertyMap) {
-        BeanDefinitionBuilder builder = BeanDefinitionBuilder
-                .genericBeanDefinition(targetClass);
-        for (String propertyName : propertyMap.keySet()) {
-            Field field = ReflectionUtils.findField(targetClass, propertyName);
-            if (field != null) {
-                if (field.getType().isAssignableFrom(ConfigParser.class)) {
-                    // ConfigParser get from ApplicationContext
-                    builder.addPropertyReference(propertyName,
-                            propertyMap.get(propertyName).toString());
-                }
-                else {
-                    // wired properties
-                    builder.addPropertyValue(propertyName, propertyMap.get(propertyName));
-                }
-            }
-        }
+	private void registerDataSource(String beanName, Class targetClass,
+			Map<String, Object> propertyMap) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder
+				.genericBeanDefinition(targetClass);
+		for (String propertyName : propertyMap.keySet()) {
+			Field field = ReflectionUtils.findField(targetClass, propertyName);
+			if (field != null) {
+				if (field.getType().isAssignableFrom(Converter.class)) {
+					// Converter get from ApplicationContext
+					builder.addPropertyReference(propertyName,
+							propertyMap.get(propertyName).toString());
+				}
+				else {
+					// wired properties
+					builder.addPropertyValue(propertyName, propertyMap.get(propertyName));
+				}
+			}
+		}
 
-        DefaultListableBeanFactory beanFactory = (DefaultListableBeanFactory) applicationContext
-                .getAutowireCapableBeanFactory();
-        beanFactory.registerBeanDefinition(beanName, builder.getBeanDefinition());
-    }
+		DefaultListableBeanFactory beanFactory = (DefaultListableBeanFactory) applicationContext
+				.getAutowireCapableBeanFactory();
+		beanFactory.registerBeanDefinition(beanName, builder.getBeanDefinition());
+	}
 
-    class SentinelDataSourceField {
-        private SentinelDataSource sentinelDataSource;
-        private Field field;
+	class SentinelDataSourceField {
+		private SentinelDataSource sentinelDataSource;
+		private Field field;
 
-        public SentinelDataSourceField(SentinelDataSource sentinelDataSource,
-                                       Field field) {
-            this.sentinelDataSource = sentinelDataSource;
-            this.field = field;
-        }
+		public SentinelDataSourceField(SentinelDataSource sentinelDataSource,
+				Field field) {
+			this.sentinelDataSource = sentinelDataSource;
+			this.field = field;
+		}
 
-        public SentinelDataSource getSentinelDataSource() {
-            return sentinelDataSource;
-        }
+		public SentinelDataSource getSentinelDataSource() {
+			return sentinelDataSource;
+		}
 
-        public void setSentinelDataSource(SentinelDataSource sentinelDataSource) {
-            this.sentinelDataSource = sentinelDataSource;
-        }
+		public void setSentinelDataSource(SentinelDataSource sentinelDataSource) {
+			this.sentinelDataSource = sentinelDataSource;
+		}
 
-        public Field getField() {
-            return field;
-        }
+		public Field getField() {
+			return field;
+		}
 
-        public void setField(Field field) {
-            this.field = field;
-        }
-    }
+		public void setField(Field field) {
+			this.field = field;
+		}
+	}
 
 }

spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java

@@ -2,7 +2,7 @@ package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
 
 import org.springframework.beans.factory.FactoryBean;
 
-import com.alibaba.csp.sentinel.datasource.ConfigParser;
+import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.apollo.ApolloDataSource;
 
 /**
@@ -14,12 +14,12 @@ public class ApolloDataSourceFactoryBean implements FactoryBean<ApolloDataSource
     private String namespaceName;
     private String flowRulesKey;
     private String defaultFlowRuleValue;
-    private ConfigParser configParser;
+    private Converter converter;
 
     @Override
     public ApolloDataSource getObject() throws Exception {
         return new ApolloDataSource(namespaceName, flowRulesKey, defaultFlowRuleValue,
-                configParser);
+                converter);
     }
 
     @Override
@@ -56,11 +56,11 @@ public class ApolloDataSourceFactoryBean implements FactoryBean<ApolloDataSource
         this.defaultFlowRuleValue = defaultFlowRuleValue;
     }
 
-    public ConfigParser getConfigParser() {
-        return configParser;
+    public Converter getConverter() {
+        return converter;
     }
 
-    public void setConfigParser(ConfigParser configParser) {
-        this.configParser = configParser;
+    public void setConverter(Converter converter) {
+        this.converter = converter;
     }
 }

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

@@ -5,7 +5,7 @@ import java.nio.charset.Charset;
 
 import org.springframework.beans.factory.FactoryBean;
 
-import com.alibaba.csp.sentinel.datasource.ConfigParser;
+import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource;
 
 /**
@@ -18,11 +18,11 @@ public class FileRefreshableDataSourceFactoryBean implements FactoryBean<FileRef
     private String charset;
     private long recommendRefreshMs;
     private int bufSize;
-    private ConfigParser configParser;
+    private Converter converter;
 
     @Override
     public FileRefreshableDataSource getObject() throws Exception {
-        return new FileRefreshableDataSource(new File(file), configParser,
+        return new FileRefreshableDataSource(new File(file), converter,
                 recommendRefreshMs, bufSize, Charset.forName(charset));
     }
 
@@ -68,11 +68,11 @@ public class FileRefreshableDataSourceFactoryBean implements FactoryBean<FileRef
         this.bufSize = bufSize;
     }
 
-    public ConfigParser getConfigParser() {
-        return configParser;
+    public Converter getConverter() {
+        return converter;
     }
 
-    public void setConfigParser(ConfigParser configParser) {
-        this.configParser = configParser;
+    public void setConverter(Converter converter) {
+        this.converter = converter;
     }
 }

spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java

@@ -2,7 +2,7 @@ package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
 
 import org.springframework.beans.factory.FactoryBean;
 
-import com.alibaba.csp.sentinel.datasource.ConfigParser;
+import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.nacos.NacosDataSource;
 
 /**
@@ -14,11 +14,11 @@ public class NacosDataSourceFactoryBean implements FactoryBean<NacosDataSource>
     private String serverAddr;
     private String groupId;
     private String dataId;
-    private ConfigParser configParser;
+    private Converter converter;
 
     @Override
     public NacosDataSource getObject() throws Exception {
-        return new NacosDataSource(serverAddr, groupId, dataId, configParser);
+        return new NacosDataSource(serverAddr, groupId, dataId, converter);
     }
 
     @Override
@@ -55,11 +55,11 @@ public class NacosDataSourceFactoryBean implements FactoryBean<NacosDataSource>
         this.dataId = dataId;
     }
 
-    public ConfigParser getConfigParser() {
-        return configParser;
+    public Converter getConverter() {
+        return converter;
     }
 
-    public void setConfigParser(ConfigParser configParser) {
-        this.configParser = configParser;
+    public void setConverter(Converter converter) {
+        this.converter = converter;
     }
 }

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

@@ -3,7 +3,7 @@ package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.FactoryBean;
 
-import com.alibaba.csp.sentinel.datasource.ConfigParser;
+import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.zookeeper.ZookeeperDataSource;
 
 /**
@@ -12,74 +12,74 @@ import com.alibaba.csp.sentinel.datasource.zookeeper.ZookeeperDataSource;
  */
 public class ZookeeperDataSourceFactoryBean implements FactoryBean<ZookeeperDataSource> {
 
-    private String serverAddr;
+	private String serverAddr;
 
-    private String path;
+	private String path;
 
-    private String groupId;
-    private String dataId;
+	private String groupId;
+	private String dataId;
 
-    private ConfigParser configParser;
+	private Converter converter;
 
-    @Override
-    public ZookeeperDataSource getObject() throws Exception {
-        if (StringUtils.isNotEmpty(groupId) && StringUtils.isNotEmpty(dataId)) {
-            // the path will be /{groupId}/{dataId}
-            return new ZookeeperDataSource(serverAddr, groupId, dataId, configParser);
-        }
-        else {
-            // using path directly
-            return new ZookeeperDataSource(serverAddr, path, configParser);
-        }
-    }
+	@Override
+	public ZookeeperDataSource getObject() throws Exception {
+		if (StringUtils.isNotEmpty(groupId) && StringUtils.isNotEmpty(dataId)) {
+			// the path will be /{groupId}/{dataId}
+			return new ZookeeperDataSource(serverAddr, groupId, dataId, converter);
+		}
+		else {
+			// using path directly
+			return new ZookeeperDataSource(serverAddr, path, converter);
+		}
+	}
 
-    @Override
-    public Class<?> getObjectType() {
-        return ZookeeperDataSource.class;
-    }
+	@Override
+	public Class<?> getObjectType() {
+		return ZookeeperDataSource.class;
+	}
 
-    @Override
-    public boolean isSingleton() {
-        return true;
-    }
+	@Override
+	public boolean isSingleton() {
+		return true;
+	}
 
-    public String getServerAddr() {
-        return serverAddr;
-    }
+	public String getServerAddr() {
+		return serverAddr;
+	}
 
-    public void setServerAddr(String serverAddr) {
-        this.serverAddr = serverAddr;
-    }
+	public void setServerAddr(String serverAddr) {
+		this.serverAddr = serverAddr;
+	}
 
-    public String getPath() {
-        return path;
-    }
+	public String getPath() {
+		return path;
+	}
 
-    public void setPath(String path) {
-        this.path = path;
-    }
+	public void setPath(String path) {
+		this.path = path;
+	}
 
-    public String getGroupId() {
-        return groupId;
-    }
+	public String getGroupId() {
+		return groupId;
+	}
 
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
 
-    public String getDataId() {
-        return dataId;
-    }
+	public String getDataId() {
+		return dataId;
+	}
 
-    public void setDataId(String dataId) {
-        this.dataId = dataId;
-    }
+	public void setDataId(String dataId) {
+		this.dataId = dataId;
+	}
 
-    public ConfigParser getConfigParser() {
-        return configParser;
-    }
+	public Converter getConverter() {
+		return converter;
+	}
 
-    public void setConfigParser(ConfigParser configParser) {
-        this.configParser = configParser;
-    }
+	public void setConverter(Converter converter) {
+		this.converter = converter;
+	}
 }