Merge pull request alibaba#3 from spring-cloud-incubator/master

Merge

README-zh.md

@@ -48,7 +48,7 @@ Example 列表：
 
 [Nacos Discovery Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md)
 
-[AliCloud OSS Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/storage-example/readme-zh.md)
+[AliCloud OSS Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/oss-example/readme-zh.md)
 
 ## 版本管理规范
 项目的版本号格式为 x.x.x 的形式，其中 x 的数值类型为数字，从0开始取值，且不限于 0~9 这个范围。项目处于孵化器阶段时，第一位版本号固定使用0，即版本号为 0.x.x 的格式。

README.md

@@ -47,7 +47,7 @@ Examples：
 
 [Nacos Discovery Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md)
 
-[AliCloud OSS Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/storage-example/readme.md)
+[AliCloud OSS Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/oss-example/readme.md)
 
 ## Version control guidelines
 The version number of the project is in the form of x.x.x, where x is a number, starting from 0, and is not limited to the range 0~9. When the project is in the incubator phase, the first version number is fixed to 0, that is, the version number is 0.x.x.

Roadmap-zh.md

@@ -15,7 +15,7 @@ Spring Cloud Alibaba 致力于提供分布式应用服务开发的一站式解
 **Nacos**
 阿里巴巴开源产品，一个更易于构建云原生应用的动态服务发现、配置管理和服务管理平台。
 
-**Aliyun OSS**
+**AliCloud OSS**
 阿里云对象存储服务（Object Storage Service，简称 OSS），是阿里云提供的海量、安全、低成本、高可靠的云存储服务。您可以在任何应用、任何时间、任何地点存储和访问任意类型的数据。
 
 ## 即将加入的组件

pom.xml

@@ -14,7 +14,7 @@
 
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-alibaba</artifactId>
-    <version>0.2.0.BUILD-SNAPSHOT</version>
+    <version>0.2.0</version>
     <packaging>pom</packaging>
     <name>Spring Cloud Alibaba</name>
 
@@ -74,12 +74,14 @@
     <modules>
         <module>spring-cloud-alibaba-dependencies</module>
         <module>spring-cloud-alibaba-sentinel</module>
-        <module>spring-cloud-alibaba-storage</module>
+
         <module>spring-cloud-alibaba-nacos-config</module>
         <module>spring-cloud-alibaba-nacos-discovery</module>
         <module>spring-cloud-alibaba-examples</module>
         <module>spring-cloud-alibaba-test</module>
         <module>spring-cloud-starter-alibaba</module>
+        <module>spring-cloud-starter-alicloud</module>
+        <module>spring-cloud-alicloud-oss</module>
     </modules>
 
     <dependencyManagement>

spring-cloud-alibaba-dependencies/pom.xml

@@ -10,15 +10,15 @@
         <relativePath/>
     </parent>
     <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-    <version>0.2.0.BUILD-SNAPSHOT</version>
+    <version>0.2.0</version>
     <packaging>pom</packaging>
     <name>Spring Cloud Alibaba Dependencies</name>
     <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-RC1</nacos.version>
+        <nacos.version>0.2.1</nacos.version>
     </properties>
 
     <dependencyManagement>
@@ -81,7 +81,7 @@
             </dependency>
 
 
-            <!-- Aliyun storage dependencies -->
+            <!-- Aliyun OSS dependencies -->
             <dependency>
                 <groupId>com.aliyun.oss</groupId>
                 <artifactId>aliyun-sdk-oss</artifactId>
@@ -97,7 +97,7 @@
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-storage</artifactId>
+                <artifactId>spring-cloud-alicloud-oss</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -119,7 +119,7 @@
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-starter-alibaba-storage</artifactId>
+                <artifactId>spring-cloud-starter-alicloud-oss</artifactId>
                 <version>${project.version}</version>
             </dependency>
 

spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <version>0.2.0.BUILD-SNAPSHOT</version>
+        <version>0.2.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>nacos-discovery-example</artifactId>
-        <version>0.2.0.BUILD-SNAPSHOT</version>
+        <version>0.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>nacos-discovery-example</artifactId>
-        <version>0.2.0.BUILD-SNAPSHOT</version>
+        <version>0.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <version>0.2.0.BUILD-SNAPSHOT</version>
+        <version>0.2.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

spring-cloud-alibaba-examples/storage-example/pom.xml → spring-cloud-alibaba-examples/oss-example/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <version>0.2.0.BUILD-SNAPSHOT</version>
+        <version>0.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
 
-    <artifactId>storage-example</artifactId>
+    <artifactId>oss-example</artifactId>
     <packaging>jar</packaging>
-    <description>Example demonstrating how to use storage</description>
+    <description>Example demonstrating how to use alicloud oss</description>
 
 
     <dependencies>
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-storage</artifactId>
+            <artifactId>spring-cloud-starter-alicloud-oss</artifactId>
         </dependency>
 
         <dependency>

spring-cloud-alibaba-examples/storage-example/readme-zh.md → spring-cloud-alibaba-examples/oss-example/readme-zh.md

@@ -1,4 +1,4 @@
-# Storage Example
+# OSS Example
 
 ## 项目说明
 
@@ -13,11 +13,11 @@
 
 **注意：本节只是为了便于您理解接入方式，本示例代码中已经完成接入工作，您只需修改 accessKeyId、secretAccessKey、region 即可。**
 
-1. 修改 pom.xml 文件，引入 alibaba-storage starter。	
+1. 修改 pom.xml 文件，引入 alicloud-oss starter。	
 
 	    <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-storage</artifactId>
+            <artifactId>spring-cloud-starter-alicloud-oss</artifactId>
         </dependency>
 
 2. 在配置文件中配置 OSS 服务对应的 accessKeyId、secretAccessKey 和 region。

spring-cloud-alibaba-examples/storage-example/readme.md → spring-cloud-alibaba-examples/oss-example/readme.md

@@ -1,4 +1,4 @@
-# Storage Example
+# OSS Example
 ## Introduction
 
 If your applications are Spring Cloud applications and you need to use Alibaba Cloud's OSS service for file storage (for example, storing commodity image for your e-commerce business), you can use OSS starter. This topic provides an example to illustrate how to use OSS starter to implement object storage for Spring Cloud applications.
@@ -13,11 +13,11 @@ If your applications are Spring Cloud applications and you need to use Alibaba C
 Before we start the demo, let's learn how to connect OSS to a Spring Cloud application.
 **Note: This section is to show you how to connect to oss. The actual configurations have been completed in the following example, and you only need to specify your accessKeyId, secretAccessKey and region.**
 
-1. Add dependency spring-cloud-starter-alibaba-storage in the pom.xml file in your Spring Cloud project.
+1. Add dependency spring-cloud-starter-alicloud-oss in the pom.xml file in your Spring Cloud project.
 
 	    <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-storage</artifactId>
+            <artifactId>spring-cloud-starter-alicloud-oss</artifactId>
         </dependency>
 
 2. Configure accessKeyId, secretAccessKey and region in application.properties.

spring-cloud-alibaba-examples/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-alibaba</artifactId>
-        <version>0.2.0.BUILD-SNAPSHOT</version>
+        <version>0.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <module>sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api</module>
         <module>nacos-example/nacos-discovery-example</module>
         <module>nacos-example/nacos-config-example</module>
-        <module>storage-example</module>
+        <module>oss-example</module>
     </modules>
 
     <build>

spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-alibaba-examples</artifactId>
-        <version>0.2.0.BUILD-SNAPSHOT</version>
+        <version>0.2.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -78,7 +78,7 @@
     ```
 	spring.application.name=sentinel-example
 	server.port=18083
-	spring.cloud.sentinel.dashboard=localhost:8080
+	spring.cloud.sentinel.transport.dashboard=localhost:8080
     ```
 	
 2. 启动应用，支持 IDE 直接启动和编译打包后启动。
@@ -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。
 
@@ -204,13 +204,13 @@ Sentinel starter 整合了目前存在的几类 DataSource。只需要在配置
     spring.cloud.sentinel.datasource.recommendRefreshMs=2000
     spring.cloud.sentinel.datasource.bufSize=2048
     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
 
 然后使用`@SentinelDataSource` 注解修饰 DataSource 即可注入：
 
     @SentinelDataSource("spring.cloud.sentinel.datasource")
-    private DataSource dataSource;
+    private ReadableDataSource dataSource;
 
 `@SentinelDataSource` 注解的 value 属性可以不填。默认值就是 `spring.cloud.sentinel.datasource`。
 
@@ -220,7 +220,7 @@ Sentinel starter 整合了目前存在的几类 DataSource。只需要在配置
 
 `spring.cloud.sentinel.datasource.recommendRefreshMs` 里的 `recommendRefreshMs` 对应相关 DataSource 的属性。
 
-`spring.cloud.sentinel.datasource.configParser`代表 `ConfigParser` 在 Spring 容器里的 name。如果没找到，会抛出异常。
+`spring.cloud.sentinel.datasource.converter`代表 `Converter` 在 Spring 容器里的 name。如果没找到，会抛出异常。
 
 type目前支持file, nacos, zk, apollo。
 
@@ -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;
             ...
@@ -260,7 +260,7 @@ type目前支持file, nacos, zk, apollo。
             spring.cloud.sentinel.datasource.fieldA = valueA
             spring.cloud.sentinel.datasource.fieldB = valueB
 
-        注意：由于目前Sentinel的AbstractDataSource需要有个ConfigParser作为构造函数中的参数，并且它的子类的构造都是通过多个参数的构造函数构造的。
+        注意：由于目前Sentinel的AbstractDataSource需要有个Converter作为构造函数中的参数，并且它的子类的构造都是通过多个参数的构造函数构造的。
             所以目前所有的Sentinel starter中的DataSource都是基于FactoryBean并且通过设置属性构造的。如果有这方面的需求，需要再多加一个registerFactoryBean过程。
 
             SentinelDataSourceRegistry.registerFactoryBean("custeom", CustomDataSourceFactoryBean.class);

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

@@ -66,7 +66,7 @@ Before we start the demo, let's learn how to connect Sentinel to a Spring Cloud
 
 		spring.application.name=sentinel-example
 		server.port=18083
-		spring.cloud.sentinel.dashboard=localhost:8080
+		spring.cloud.sentinel.transport.dashboard=localhost:8080
 		
 2. Start the application in IDE or by building a fatjar.
 
@@ -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`.
 
@@ -177,21 +177,21 @@ If you want to define FileRefreshableDataSource:
     spring.cloud.sentinel.datasource.recommendRefreshMs=2000
     spring.cloud.sentinel.datasource.bufSize=2048
     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
 
 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`.
 
 spring.cloud.sentinel.datasource.type means the type of DataSource.
 
 spring.cloud.sentinel.datasource.recommendRefreshMs means the recommendRefreshMs property of specified DataSource.
 
-spring.cloud.sentinel.datasource.configParser means the name of spring bean that type is ConfigParser. If the bean is not exists, will throw exception.
+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.
 
@@ -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;
             ...
@@ -230,7 +230,7 @@ User-defined DataSource need 2 steps.
             spring.cloud.sentinel.datasource.fieldA = valueA
             spring.cloud.sentinel.datasource.fieldB = valueB
 
-Note: The AbstractDataSource of Sentinel need a ConfigParser as a constructor param and the subclass of AbstractDataSource was construct by multi-param constructor.
+Note: The AbstractDataSource of Sentinel need a Converter as a constructor param and the subclass of AbstractDataSource was construct by multi-param constructor.
 Now All DataSources in starter was construct by FactoryBean. If you want to do it in this way, you should register FactoryBean by SentinelDataSourceRegistry.
 
     SentinelDataSourceRegistry.registerFactoryBean("custeom", CustomDataSourceFactoryBean.class);

spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/JsonFlowRuleListParser.java

@@ -2,17 +2,18 @@
 
 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;
 
 /**
  * @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

@@ -1,6 +1,6 @@
 package org.springframework.cloud.alibaba.cloud.examples;
 
-import com.alibaba.csp.sentinel.datasource.ConfigParser;
+import com.alibaba.csp.sentinel.datasource.Converter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.alibaba.sentinel.annotation.SentinelProtect;
@@ -25,7 +25,7 @@ public RestTemplate restTemplate2() {
 	}
 
 	@Bean
-    public ConfigParser myParser() {
+    public Converter myParser() {
 	    return new JsonFlowRuleListParser();
     }