Merge pull request #57 from fangjian0423/1.x

fix sentinel bug and add a new module spring-cloud-alibaba-sentinel-datasource in branch 1.x

pom.xml

@@ -73,7 +73,7 @@
     <modules>
         <module>spring-cloud-alibaba-dependencies</module>
         <module>spring-cloud-alibaba-sentinel</module>
-
+        <module>spring-cloud-alibaba-sentinel-datasource</module>
         <module>spring-cloud-alibaba-nacos-config</module>
         <module>spring-cloud-alibaba-nacos-discovery</module>
         <module>spring-cloud-alibaba-examples</module>

spring-cloud-alibaba-dependencies/pom.xml

@@ -96,6 +96,11 @@
                 <artifactId>spring-cloud-alibaba-sentinel</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-alibaba-sentinel-datasource</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-alicloud-oss</artifactId>

spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/readme-zh.md

@@ -192,9 +192,9 @@ Sentinel 控制台支持实时监控查看，您可以通过 Sentinel 控制台
 
 <p align="center"><img src="https://cdn.nlark.com/lark/0/2018/png/54319/1532313595369-8428cd7d-9eb7-4786-a149-acf0da4a2daf.png" width="480" heigh='180' ></p>
 
-## DataSource 支持
+## ReadableDataSource 支持
 
-Sentinel 内部提供了[动态规则的扩展实现 DataSource](https://github.com/alibaba/Sentinel/wiki/%E5%8A%A8%E6%80%81%E8%A7%84%E5%88%99%E6%89%A9%E5%B1%95#datasource-%E6%89%A9%E5%B1%95)。
+Sentinel 内部提供了[动态规则的扩展实现 ReadableDataSource](https://github.com/alibaba/Sentinel/wiki/%E5%8A%A8%E6%80%81%E8%A7%84%E5%88%99%E6%89%A9%E5%B1%95#datasource-%E6%89%A9%E5%B1%95)。
 
 Sentinel starter 整合了目前存在的几类 DataSource。只需要在配置文件中进行相关配置，即可在 Spring 容器中自动注册 DataSource。
 
@@ -210,7 +210,7 @@ Sentinel starter 整合了目前存在的几类 DataSource。只需要在配置
 然后使用`@SentinelDataSource` 注解修饰 DataSource 即可注入：
 
     @SentinelDataSource("spring.cloud.sentinel.datasource")
-    private DataSource dataSource;
+    private ReadableDataSource dataSource;
 
 `@SentinelDataSource` 注解的 value 属性可以不填。默认值就是 `spring.cloud.sentinel.datasource`。
 
@@ -222,7 +222,7 @@ Sentinel starter 整合了目前存在的几类 DataSource。只需要在配置
 
 `spring.cloud.sentinel.datasource.converter`代表 `Converter` 在 Spring 容器里的 name。如果没找到，会抛出异常。
     
-type目前支持file, nacos, zk, apollo。
+type目前支持file, nacos, zk, apollo。其中nacos，zk，apollo的使用需要加上对应的依赖`sentinel-datasource-nacos`, `sentinel-datasource-zookeeper`, `sentinel-datasource-apollo`
 
 ### 自定义DataSource
 
@@ -230,7 +230,7 @@ type目前支持file, nacos, zk, apollo。
 
 1. 定义DataSource
   
-        public class CustomDataSource implements DataSource {
+        public class CustomDataSource implements ReadableDataSource {
             private String fieldA;
             private String fieldB;
             ...

spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/readme.md

@@ -165,9 +165,9 @@ To see the metrics, click **实时监控(Real-time Monitoring)** in the left-sid
 
 <p align="center"><img src="https://cdn.nlark.com/lark/0/2018/png/54319/1532313595369-8428cd7d-9eb7-4786-a149-acf0da4a2daf.png" width="480" heigh='180'></p>
 
-## DataSource
+## ReadableDataSource
 
-Sentinel provide [DataSource](https://github.com/alibaba/Sentinel/blob/master/sentinel-extension/sentinel-datasource-extension/src/main/java/com/alibaba/csp/sentinel/datasource/DataSource.java) to manage dynamic rules.
+Sentinel provide [ReadableDataSource](https://github.com/alibaba/Sentinel/blob/master/sentinel-extension/sentinel-datasource-extension/src/main/java/com/alibaba/csp/sentinel/datasource/ReadableDataSource.java) to manage dynamic rules.
 
 Sentinel starter integrated 4 DataSources provided by Sentinel. It will be register into Spring Context if you write some configs in `application.properties`.
 
@@ -183,7 +183,7 @@ If you want to define FileRefreshableDataSource:
 then use `@SentinelDataSource` to annotate DataSource:
  
     @SentinelDataSource("spring.cloud.sentinel.datasource")
-    private DataSource dataSource;
+    private ReadableDataSource dataSource;
     
 The value() of `@SentinelDataSource` is not required, it means the prefix of configuration. Default value is `spring.cloud.sentinel.datasource`.
 
@@ -193,7 +193,7 @@ spring.cloud.sentinel.datasource.recommendRefreshMs means the recommendRefreshMs
 
 spring.cloud.sentinel.datasource.converter means the name of spring bean that type is Converter. If the bean is not exists, will throw exception.
     
-Now datasource type support 4 categories: file, nacos, zk, apollo.
+Now datasource type support 4 categories: file, nacos, zk, apollo. If you want to using nacos, zk or apollo, you should add `sentinel-datasource-nacos`, `sentinel-datasource-zookeeper` or `sentinel-datasource-apollo` dependency.
 
 ### User-defined DataSource
 
@@ -201,7 +201,7 @@ User-defined DataSource need 2 steps.
 
 1. Define DataSource
     
-        public class CustomDataSource implements DataSource {
+        public class CustomDataSource implements ReadableDataSource {
             private String fieldA;
             private String fieldB;
             ...

spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/resources/application.properties

@@ -10,5 +10,5 @@ spring.cloud.sentinel.datasource.type=file
 spring.cloud.sentinel.datasource.recommendRefreshMs=3000
 spring.cloud.sentinel.datasource.bufSize=4056196
 spring.cloud.sentinel.datasource.charset=utf-8
-spring.cloud.sentinel.datasource.configParser=myParser
+spring.cloud.sentinel.datasource.converter=myParser
 spring.cloud.sentinel.datasource.file=/Users/you/rule.json

spring-cloud-alibaba-sentinel-datasource/pom.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-alibaba</artifactId>
+        <version>0.1.0.BUILD-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-alibaba-sentinel-datasource</artifactId>
+    <name>Spring Cloud Alibaba Sentinel DataSource</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-datasource-extension</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-datasource-nacos</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-datasource-zookeeper</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-datasource-apollo</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <!--spring boot-->
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.alibaba.sentinel.datasource;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import com.alibaba.csp.sentinel.datasource.ReadableDataSource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.PropertiesLoaderUtils;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+
+import static org.springframework.core.io.support.ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX;
+
+/**
+ * {@link ReadableDataSource} Loader
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ */
+public class DataSourceLoader {
+
+    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 ALL_PROPERTIES_RESOURCES_LOCATION = CLASSPATH_ALL_URL_PREFIX
+        + PROPERTIES_RESOURCE_LOCATION;
+
+    private final static ConcurrentMap<String, Class<? extends ReadableDataSource>> dataSourceClassesCache
+        = new ConcurrentHashMap<String, Class<? extends ReadableDataSource>>(
+        4);
+
+    static void loadAllDataSourceClassesCache() {
+        Map<String, Class<? extends ReadableDataSource>> dataSourceClassesMap = loadAllDataSourceClassesCache(
+            ALL_PROPERTIES_RESOURCES_LOCATION);
+
+        dataSourceClassesCache.putAll(dataSourceClassesMap);
+    }
+
+    static Map<String, Class<? extends ReadableDataSource>> loadAllDataSourceClassesCache(
+        String resourcesLocation) {
+
+        Map<String, Class<? extends ReadableDataSource>> dataSourcesMap
+            = new HashMap<String, Class<? extends ReadableDataSource>>(
+            4);
+
+        ClassLoader classLoader = DataSourceLoader.class.getClassLoader();
+
+        ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+
+        try {
+
+            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()) {
+
+                        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;
+                        }
+
+                        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(ReadableDataSource.class, dataSourceClass);
+
+                        dataSourcesMap.put(type,
+                            (Class<? extends ReadableDataSource>)dataSourceClass);
+
+                        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);
+            }
+        }
+
+        return dataSourcesMap;
+    }
+
+    public static Class<? extends ReadableDataSource> loadClass(String type)
+        throws IllegalArgumentException {
+
+        Class<? extends ReadableDataSource> 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!");
+        }
+
+        return dataSourceClass;
+
+    }
+
+}

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.alibaba.sentinel.datasource;
+
+/**
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ */
+public interface SentinelDataSourceConstants {
+
+    String PROPERTY_PREFIX = "spring.cloud.sentinel";
+
+    String PROPERTY_ITEM_SEPARATOR = ".";
+
+    String PROPERTY_DATASOURCE_NAME = "datasource";
+
+    String PROPERTY_DATASOURCE_PREFIX = PROPERTY_PREFIX + PROPERTY_ITEM_SEPARATOR
+        + PROPERTY_DATASOURCE_NAME;
+
+}

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

@@ -0,0 +1,264 @@
+/*
+ * Copyright (C) 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.alibaba.sentinel.datasource;
+
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.alibaba.csp.sentinel.datasource.Converter;
+import com.alibaba.csp.sentinel.datasource.ReadableDataSource;
+import com.alibaba.csp.sentinel.property.SentinelProperty;
+import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
+import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRuleManager;
+import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
+import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
+import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
+import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager;
+import com.alibaba.csp.sentinel.slots.system.SystemRule;
+import com.alibaba.csp.sentinel.slots.system.SystemRuleManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.PropertyValues;
+import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.cloud.alibaba.sentinel.datasource.annotation.SentinelDataSource;
+import org.springframework.cloud.alibaba.sentinel.datasource.util.PropertySourcesUtils;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.util.ReflectionUtils;
+import org.springframework.util.StringUtils;
+
+import static org.springframework.core.annotation.AnnotationUtils.getAnnotation;
+
+/**
+ * {@link SentinelDataSource @SentinelDataSource} Post Processor
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ * @see ReadableDataSource
+ * @see SentinelDataSource
+ */
+public class SentinelDataSourcePostProcessor
+    extends InstantiationAwareBeanPostProcessorAdapter
+    implements MergedBeanDefinitionPostProcessor {
+
+    private static final Logger logger = LoggerFactory
+        .getLogger(SentinelDataSourcePostProcessor.class);
+
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    @Autowired
+    private ConfigurableEnvironment environment;
+
+    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 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 = SentinelDataSourceConstants.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;
+        }
+
+        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);
+
+        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(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());
+    }
+
+    @EventListener(classes = ApplicationReadyEvent.class)
+    public void appStartedListener(ApplicationReadyEvent event) throws Exception {
+        Map<String, ReadableDataSource> dataSourceMap = event.getApplicationContext().getBeansOfType(
+            ReadableDataSource.class);
+        if (dataSourceMap.size() == 1) {
+            ReadableDataSource dataSource = dataSourceMap.values().iterator().next();
+            Object ruleConfig = dataSource.loadConfig();
+            SentinelProperty sentinelProperty = dataSource.getProperty();
+            if (checkRuleType(ruleConfig, FlowRule.class)) {
+                FlowRuleManager.register2Property(sentinelProperty);
+            }
+            if (checkRuleType(ruleConfig, DegradeRule.class)) {
+                DegradeRuleManager.register2Property(sentinelProperty);
+            }
+            if (checkRuleType(ruleConfig, SystemRule.class)) {
+                SystemRuleManager.register2Property(sentinelProperty);
+            }
+            if (checkRuleType(ruleConfig, AuthorityRule.class)) {
+                AuthorityRuleManager.register2Property(sentinelProperty);
+            }
+        }
+    }
+
+    private boolean checkRuleType(Object ruleConfig, Class type) {
+        if (ruleConfig.getClass() == type) {
+            return true;
+        } else if (ruleConfig instanceof List) {
+            List ruleList = (List)ruleConfig;
+            List checkList = new ArrayList();
+            for (Object rule : ruleList) {
+                if (rule.getClass() == type) {
+                    checkList.add(rule);
+                }
+            }
+            if (ruleList.size() == checkList.size()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    class SentinelDataSourceField {
+        private SentinelDataSource sentinelDataSource;
+        private Field field;
+
+        public SentinelDataSourceField(SentinelDataSource sentinelDataSource,
+                                       Field field) {
+            this.sentinelDataSource = sentinelDataSource;
+            this.field = field;
+        }
+
+        public SentinelDataSource getSentinelDataSource() {
+            return sentinelDataSource;
+        }
+
+        public void setSentinelDataSource(SentinelDataSource sentinelDataSource) {
+            this.sentinelDataSource = sentinelDataSource;
+        }
+
+        public Field getField() {
+            return field;
+        }
+
+        public void setField(Field field) {
+            this.field = field;
+        }
+    }
+
+}

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

@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.alibaba.sentinel.datasource;
 
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.HashMap;
 
 import com.alibaba.csp.sentinel.datasource.ReadableDataSource;
 
@@ -29,7 +29,7 @@ import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.Zookeep
 /**
  * Registry to save DataSource FactoryBean
  *
- * @author fangjian
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  * @see ReadableDataSource
  * @see FileRefreshableDataSourceFactoryBean
  * @see ZookeeperDataSourceFactoryBean
@@ -38,7 +38,7 @@ import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.Zookeep
  */
 public class SentinelDataSourceRegistry {
 
-    private static ConcurrentHashMap<String, Class<? extends FactoryBean>> cache = new ConcurrentHashMap<>(
+    private static HashMap<String, Class<? extends FactoryBean>> cache = new HashMap<>(
         32);
 
     static {
@@ -54,7 +54,6 @@ public class SentinelDataSourceRegistry {
 
     public static synchronized void registerFactoryBean(String alias,
                                                         Class<? extends FactoryBean> clazz) {
-        cache.putIfAbsent(alias, clazz);
         cache.put(alias, clazz);
     }
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.annotation;
+package org.springframework.cloud.alibaba.sentinel.datasource.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -31,7 +31,7 @@ import org.springframework.core.annotation.AliasFor;
  * into a Spring Bean. The Properties of DataSource bean get from config files with
  * specific prefix.
  *
- * @author fangjian
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  * @see ReadableDataSource
  */
 @Target({ElementType.FIELD})

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

@@ -1,12 +1,14 @@
 package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
 
-import org.springframework.beans.factory.FactoryBean;
-
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.apollo.ApolloDataSource;
 
+import org.springframework.beans.factory.FactoryBean;
+
 /**
- * @author fangjian
+ * A {@link FactoryBean} for creating {@link ApolloDataSource} instance.
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  * @see ApolloDataSource
  */
 public class ApolloDataSourceFactoryBean implements FactoryBean<ApolloDataSource> {
@@ -19,7 +21,7 @@ public class ApolloDataSourceFactoryBean implements FactoryBean<ApolloDataSource
     @Override
     public ApolloDataSource getObject() throws Exception {
         return new ApolloDataSource(namespaceName, flowRulesKey, defaultFlowRuleValue,
-                converter);
+            converter);
     }
 
     @Override

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

@@ -3,13 +3,15 @@ package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
 import java.io.File;
 import java.nio.charset.Charset;
 
-import org.springframework.beans.factory.FactoryBean;
-
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource;
 
+import org.springframework.beans.factory.FactoryBean;
+
 /**
- * @author fangjian
+ * A {@link FactoryBean} for creating {@link FileRefreshableDataSource} instance.
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  * @see FileRefreshableDataSource
  */
 public class FileRefreshableDataSourceFactoryBean implements FactoryBean<FileRefreshableDataSource> {
@@ -23,7 +25,7 @@ public class FileRefreshableDataSourceFactoryBean implements FactoryBean<FileRef
     @Override
     public FileRefreshableDataSource getObject() throws Exception {
         return new FileRefreshableDataSource(new File(file), converter,
-                recommendRefreshMs, bufSize, Charset.forName(charset));
+            recommendRefreshMs, bufSize, Charset.forName(charset));
     }
 
     @Override

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

@@ -1,12 +1,14 @@
 package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
 
-import org.springframework.beans.factory.FactoryBean;
-
 import com.alibaba.csp.sentinel.datasource.Converter;
 import com.alibaba.csp.sentinel.datasource.nacos.NacosDataSource;
 
+import org.springframework.beans.factory.FactoryBean;
+
 /**
- * @author fangjian
+ * A {@link FactoryBean} for creating {@link NacosDataSource} instance.
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
  * @see NacosDataSource
  */
 public class NacosDataSourceFactoryBean implements FactoryBean<NacosDataSource> {

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

@@ -0,0 +1,86 @@
+package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
+
+import com.alibaba.csp.sentinel.datasource.Converter;
+import com.alibaba.csp.sentinel.datasource.zookeeper.ZookeeperDataSource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.FactoryBean;
+
+/**
+ * A {@link FactoryBean} for creating {@link ZookeeperDataSource} instance.
+ *
+ * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
+ * @see ZookeeperDataSource
+ */
+public class ZookeeperDataSourceFactoryBean implements FactoryBean<ZookeeperDataSource> {
+
+    private String serverAddr;
+
+    private String path;
+
+    private String groupId;
+    private String dataId;
+
+    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, converter);
+        } else {
+            // using path directly
+            return new ZookeeperDataSource(serverAddr, path, converter);
+        }
+    }
+
+    @Override
+    public Class<?> getObjectType() {
+        return ZookeeperDataSource.class;
+    }
+
+    @Override
+    public boolean isSingleton() {
+        return true;
+    }
+
+    public String getServerAddr() {
+        return serverAddr;
+    }
+
+    public void setServerAddr(String serverAddr) {
+        this.serverAddr = serverAddr;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public String getDataId() {
+        return dataId;
+    }
+
+    public void setDataId(String dataId) {
+        this.dataId = dataId;
+    }
+
+    public Converter getConverter() {
+        return converter;
+    }
+
+    public void setConverter(Converter converter) {
+        this.converter = converter;
+    }
+}

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

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.alibaba.sentinel.util;
+package org.springframework.cloud.alibaba.sentinel.datasource.util;
-
-import org.springframework.core.env.EnumerablePropertySource;
-import org.springframework.core.env.PropertySource;
-import org.springframework.core.env.PropertySources;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import org.springframework.core.env.EnumerablePropertySource;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.env.PropertySources;
+
 /**
  * {@link PropertySources} Utilities
  *
@@ -47,7 +47,7 @@ public abstract class PropertySourcesUtils {
 
         for (PropertySource<?> source : propertySources) {
             if (source instanceof EnumerablePropertySource) {
-                for (String name : ((EnumerablePropertySource<?>) source).getPropertyNames()) {
+                for (String name : ((EnumerablePropertySource<?>)source).getPropertyNames()) {
                     if (!subProperties.containsKey(name) && name.startsWith(normalizedPrefix)) {
                         String subName = name.substring(normalizedPrefix.length());
                         if (!subProperties.containsKey(subName)) { // take first one

spring-cloud-alibaba-sentinel/pom.xml

@@ -25,29 +25,6 @@
             <artifactId>sentinel-transport-simple-http</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba.csp</groupId>
-            <artifactId>sentinel-datasource-extension</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.csp</groupId>
-            <artifactId>sentinel-datasource-nacos</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.csp</groupId>
-            <artifactId>sentinel-datasource-zookeeper</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.csp</groupId>
-            <artifactId>sentinel-datasource-apollo</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>com.alibaba.csp</groupId>
             <artifactId>sentinel-annotation-aspectj</artifactId>
@@ -58,6 +35,11 @@
             <artifactId>sentinel-dubbo-adapter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-alibaba-sentinel-datasource</artifactId>
+        </dependency>
+
         <!--spring boot-->
 
         <dependency>

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

@@ -23,11 +23,4 @@ public interface SentinelConstants {
 
     String PROPERTY_PREFIX = "spring.cloud.sentinel";
 
-    String PROPERTY_ITEM_SEPARATOR = ".";
-
-    String PROPERTY_DATASOURCE_NAME = "datasource";
-
-    String PROPERTY_DATASOURCE_PREFIX = PROPERTY_PREFIX + PROPERTY_ITEM_SEPARATOR
-            + PROPERTY_DATASOURCE_NAME;
-
 }

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

@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.alibaba.sentinel.datasource;
-
-import static org.springframework.core.io.support.ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.io.support.PropertiesLoaderUtils;
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-
-import com.alibaba.csp.sentinel.datasource.ReadableDataSource;
-
-/**
- * {@link ReadableDataSource} Loader
- *
- * @author fangjian
- */
-public class DataSourceLoader {
-
-	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 ALL_PROPERTIES_RESOURCES_LOCATION = CLASSPATH_ALL_URL_PREFIX
-			+ PROPERTIES_RESOURCE_LOCATION;
-
-	private final static ConcurrentMap<String, Class<? extends ReadableDataSource>> dataSourceClassesCache = new ConcurrentHashMap<String, Class<? extends ReadableDataSource>>(
-			4);
-
-	static void loadAllDataSourceClassesCache() {
-		Map<String, Class<? extends ReadableDataSource>> dataSourceClassesMap = loadAllDataSourceClassesCache(
-				ALL_PROPERTIES_RESOURCES_LOCATION);
-
-		dataSourceClassesCache.putAll(dataSourceClassesMap);
-	}
-
-	static Map<String, Class<? extends ReadableDataSource>> loadAllDataSourceClassesCache(
-			String resourcesLocation) {
-
-		Map<String, Class<? extends ReadableDataSource>> dataSourcesMap = new HashMap<String, Class<? extends ReadableDataSource>>(
-				4);
-
-		ClassLoader classLoader = DataSourceLoader.class.getClassLoader();
-
-		ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
-
-		try {
-
-			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()) {
-
-						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;
-						}
-
-						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(ReadableDataSource.class, dataSourceClass);
-
-						dataSourcesMap.put(type,
-								(Class<? extends ReadableDataSource>) dataSourceClass);
-
-						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);
-			}
-		}
-
-		return dataSourcesMap;
-	}
-
-	public static Class<? extends ReadableDataSource> loadClass(String type)
-			throws IllegalArgumentException {
-
-		Class<? extends ReadableDataSource> 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!");
-		}
-
-		return dataSourceClass;
-
-	}
-
-}

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

@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.alibaba.sentinel.datasource;
-
-import static org.springframework.core.annotation.AnnotationUtils.getAnnotation;
-
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.PropertyValues;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
-import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.cloud.alibaba.sentinel.SentinelConstants;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelDataSource;
-import org.springframework.cloud.alibaba.sentinel.util.PropertySourcesUtils;
-import org.springframework.context.ApplicationContext;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.util.ReflectionUtils;
-import org.springframework.util.StringUtils;
-
-import com.alibaba.csp.sentinel.datasource.Converter;
-
-/**
- * {@link SentinelDataSource @SentinelDataSource} Post Processor
- *
- * @author fangjian
- * @see com.alibaba.csp.sentinel.datasource.ReadableDataSource
- * @see SentinelDataSource
- */
-public class SentinelDataSourcePostProcessor
-		extends InstantiationAwareBeanPostProcessorAdapter
-		implements MergedBeanDefinitionPostProcessor {
-
-	private static final Logger logger = LoggerFactory
-			.getLogger(SentinelDataSourcePostProcessor.class);
-
-	@Autowired
-	private ApplicationContext applicationContext;
-
-	@Autowired
-	private ConfigurableEnvironment environment;
-
-	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 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);
-
-		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;
-		}
-
-		registerDataSource(beanName, targetClass, propertyMap);
-
-		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(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());
-	}
-
-	class SentinelDataSourceField {
-		private SentinelDataSource sentinelDataSource;
-		private Field field;
-
-		public SentinelDataSourceField(SentinelDataSource sentinelDataSource,
-				Field field) {
-			this.sentinelDataSource = sentinelDataSource;
-			this.field = field;
-		}
-
-		public SentinelDataSource getSentinelDataSource() {
-			return sentinelDataSource;
-		}
-
-		public void setSentinelDataSource(SentinelDataSource sentinelDataSource) {
-			this.sentinelDataSource = sentinelDataSource;
-		}
-
-		public Field getField() {
-			return field;
-		}
-
-		public void setField(Field field) {
-			this.field = field;
-		}
-	}
-
-}

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

@@ -1,85 +0,0 @@
-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.Converter;
-import com.alibaba.csp.sentinel.datasource.zookeeper.ZookeeperDataSource;
-
-/**
- * @author fangjian
- * @see ZookeeperDataSource
- */
-public class ZookeeperDataSourceFactoryBean implements FactoryBean<ZookeeperDataSource> {
-
-	private String serverAddr;
-
-	private String path;
-
-	private String groupId;
-	private String dataId;
-
-	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, converter);
-		}
-		else {
-			// using path directly
-			return new ZookeeperDataSource(serverAddr, path, converter);
-		}
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return ZookeeperDataSource.class;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-	public String getServerAddr() {
-		return serverAddr;
-	}
-
-	public void setServerAddr(String serverAddr) {
-		this.serverAddr = serverAddr;
-	}
-
-	public String getPath() {
-		return path;
-	}
-
-	public void setPath(String path) {
-		this.path = path;
-	}
-
-	public String getGroupId() {
-		return groupId;
-	}
-
-	public void setGroupId(String groupId) {
-		this.groupId = groupId;
-	}
-
-	public String getDataId() {
-		return dataId;
-	}
-
-	public void setDataId(String dataId) {
-		this.dataId = dataId;
-	}
-
-	public Converter getConverter() {
-		return converter;
-	}
-
-	public void setConverter(Converter converter) {
-		this.converter = converter;
-	}
-}

spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml

@@ -15,18 +15,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-alibaba-sentinel</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba.csp</groupId>
-            <artifactId>sentinel-datasource-nacos</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.csp</groupId>
-            <artifactId>sentinel-datasource-zookeeper</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.csp</groupId>
-            <artifactId>sentinel-datasource-apollo</artifactId>
-        </dependency>
     </dependencies>
 
 </project>