Merge pull request #7 from spring-cloud-incubator/master

merge

spring-cloud-alibaba-dependencies/pom.xml

@@ -19,7 +19,7 @@
     <properties>
         <sentinel.version>1.5.2</sentinel.version>
         <oss.version>3.1.0</oss.version>
-        <fescar.version>0.4.2</fescar.version>
+        <seata.version>0.5.0</seata.version>
         <nacos.client.version>1.0.0</nacos.client.version>
         <nacos.config.version>0.8.0</nacos.config.version>
         <acm.version>1.0.8</acm.version>
@@ -189,12 +189,12 @@
             </dependency>
 
 
-            <!--Alibaba Fescar-->
+            <!--Alibaba Seata-->
 
             <dependency>
-                <groupId>com.alibaba.fescar</groupId>
+                <groupId>io.seata</groupId>
-                <artifactId>fescar-spring</artifactId>
+                <artifactId>seata-spring</artifactId>
-                <version>${fescar.version}</version>
+                <version>${seata.version}</version>
             </dependency>
 
             <!-- Dubbo -->

spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/AccountController.java

@@ -17,7 +17,7 @@ package org.springframework.cloud.alibaba.cloud.examples;
 
 import java.util.Random;
 
-import com.alibaba.fescar.core.context.RootContext;
+import io.seata.core.context.RootContext;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/DatabaseConfiguration.java

@@ -16,17 +16,16 @@
 package org.springframework.cloud.alibaba.cloud.examples;
 
 import java.sql.SQLException;
-import java.util.Random;
 
+import com.alibaba.druid.pool.DruidDataSource;
+
+import io.seata.rm.datasource.DataSourceProxy;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.fescar.rm.datasource.DataSourceProxy;
-
 /**
  * @author xiaojing
  */

spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/HomeController.java

@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.alibaba.cloud.examples;
 
-import com.alibaba.fescar.spring.annotation.GlobalTransactional;
+import io.seata.spring.annotation.GlobalTransactional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/DatabaseConfiguration.java

@@ -24,7 +24,7 @@ import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.fescar.rm.datasource.DataSourceProxy;
+import io.seata.rm.datasource.DataSourceProxy;
 
 /**
  * @author xiaojing

spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OrderController.java

@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.alibaba.cloud.examples;
 
-import com.alibaba.fescar.core.context.RootContext;
+import io.seata.core.context.RootContext;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

spring-cloud-alibaba-examples/seata-example/readme-zh.md

@@ -19,14 +19,14 @@
 
 1. 创建 示例中 业务所需要的数据库表
 
-1. 启动 Fescar Server
+1. 启动 Seata Server
 
 
 ### 配置数据库
 
 首先，你需要有一个支持 InnoDB 引擎的 MySQL 数据库。
 
-**注意**： 实际上，Fescar 支持不同的应用使用完全不相干的数据库，但是这里为了简单地演示一个原理，所以我们选择了只使用一个数据库。
+**注意**： 实际上，Seata 支持不同的应用使用完全不相干的数据库，但是这里为了简单地演示一个原理，所以我们选择了只使用一个数据库。
 
 将 `account-server`、`order-service`、`storage-service` 这三个应用中的 resources 目录下的 `application.properties` 文件中的如下配置修改成你运行环境中的实际配置。
 
@@ -42,7 +42,7 @@ mysql.user.password=your mysql server password
 
 ### 创建 undo_log 表
 
-[Fescar AT 模式]() 需要使用到 undo_log 表。
+[Seata AT 模式]() 需要使用到 undo_log 表。
 
 ``` $sql
 -- 注意此处0.3.0+ 增加唯一索引 ux_undo_log
@@ -93,24 +93,24 @@ CREATE TABLE `account_tbl` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 ```
 
-### 启动 Fescar Server
+### 启动 Seata Server
 
-点击这个页面 [https://github.com/alibaba/fescar/releases](https://github.com/alibaba/fescar/releases)，下载最新版本的 Fescar Server 端.
+点击这个页面 [https://github.com/seata/seata/releases](https://github.com/seata/seata/releases)，下载最新版本的 Seata Server 端.
 
 
 进入解压之后的 bin 目录，执行如下命令来启动
 
 ```$shell
-sh fescar-server.sh $LISTEN_PORT $PATH_FOR_PERSISTENT_DATA
+sh seata-server.sh $LISTEN_PORT $MODE
 ```
 
-在这个示例中，采用如下命令来启动 Fescar Server
+在这个示例中，采用如下命令来启动 Seata Server
 
 ```$shell
-sh fescar-server.sh 8091 ~/fescar/data/
+sh seata-server.sh 8091 file
 ```
 
-**注意** 如果你修改了端口号，那么记得需要在各个示例工程中的 `application.conf` 文件中，修改 grouplist 的值。
+**注意** 如果你修改了endpoint且注册中心使用默认file类型，那么记得需要在各个示例工程中的 `file.conf` 文件中，修改 grouplist 的值。
 
 
 ## 运行示例
@@ -146,12 +146,12 @@ http://127.0.0.1:18081/fescar/rest
 
 ## 对 Spring Cloud 支持点
 
-- 通过 Spring MVC 提供服务的服务提供者，在收到 header 中含有 Fescar 信息的 HTTP 请求时，可以自动还原 Fescar 上下文。
+- 通过 Spring MVC 提供服务的服务提供者，在收到 header 中含有 Seata 信息的 HTTP 请求时，可以自动还原 Seata 上下文。
 
-- 支持服务调用者通过 RestTemplate 调用时，自动传递 Fescar 上下文。
+- 支持服务调用者通过 RestTemplate 调用时，自动传递 Seata 上下文。
 
-- 支持服务调用者通过 FeignClient 调用时，自动传递 Fescar 上下文。
+- 支持服务调用者通过 FeignClient 调用时，自动传递 Seata 上下文。
 
-- 支持 FeignClient 和 Hystrix 同时使用的场景。
+- 支持 SeataClient 和 Hystrix 同时使用的场景。
 
-- 支持 FeignClient 和 Sentinel 同时使用的场景。
+- 支持 SeataClient 和 Sentinel 同时使用的场景。

spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/DatabaseConfiguration.java

@@ -19,7 +19,7 @@ package org.springframework.cloud.alibaba.cloud.examples;
 import java.sql.SQLException;
 
 import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.fescar.rm.datasource.DataSourceProxy;
+import io.seata.rm.datasource.DataSourceProxy;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;

spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/StorageController.java

@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.alibaba.cloud.examples;
 
-import com.alibaba.fescar.core.context.RootContext;
+import io.seata.core.context.RootContext;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

spring-cloud-alibaba-seata/pom.xml

@@ -16,8 +16,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>com.alibaba.fescar</groupId>
+            <groupId>io.seata</groupId>
-            <artifactId>fescar-spring</artifactId>
+            <artifactId>seata-spring</artifactId>
         </dependency>
 
         <dependency>

spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/GlobalTransactionAutoConfiguration.java

@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.alibaba.seata;
 
-import com.alibaba.fescar.spring.annotation.GlobalTransactionScanner;
+import io.seata.spring.annotation.GlobalTransactionScanner;
 
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;

spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignClient.java

@@ -23,13 +23,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.alibaba.fescar.core.context.RootContext;
-
-import org.springframework.beans.factory.BeanFactory;
-
 import feign.Client;
 import feign.Request;
 import feign.Response;
+import io.seata.core.context.RootContext;
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.util.StringUtils;
 
 /**
@@ -39,6 +37,7 @@ public class SeataFeignClient implements Client {
 
     private final Client delegate;
     private final BeanFactory beanFactory;
+    private static final int MAP_SIZE = 16;
 
     SeataFeignClient(BeanFactory beanFactory) {
         this.beanFactory = beanFactory;
@@ -57,8 +56,7 @@ public class SeataFeignClient implements Client {
 
         try {
             return this.delegate.execute(modifiedRequest, options);
-		}
+        } finally {
-		finally {
 
         }
     }
@@ -71,7 +69,7 @@ public class SeataFeignClient implements Client {
             return request;
         }
 
-		Map<String, Collection<String>> headers = new HashMap<>();
+        Map<String, Collection<String>> headers = new HashMap<>(MAP_SIZE);
         headers.putAll(request.headers());
 
         List<String> fescarXid = new ArrayList<>();

spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignClientAutoConfiguration.java

@@ -65,19 +65,19 @@ public class SeataFeignClientAutoConfiguration {
 	protected static class FeignBeanPostProcessorConfiguration {
 
 		@Bean
-        SeataBeanPostProcessor fescarBeanPostProcessor(
+        SeataBeanPostProcessor seataBeanPostProcessor(
 				SeataFeignObjectWrapper seataFeignObjectWrapper) {
 			return new SeataBeanPostProcessor(seataFeignObjectWrapper);
 		}
 
 		@Bean
-		SeataContextBeanPostProcessor fescarContextBeanPostProcessor(
+		SeataContextBeanPostProcessor seataContextBeanPostProcessor(
 				BeanFactory beanFactory) {
 			return new SeataContextBeanPostProcessor(beanFactory);
 		}
 
 		@Bean
-		SeataFeignObjectWrapper fescarFeignObjectWrapper(BeanFactory beanFactory) {
+		SeataFeignObjectWrapper seataFeignObjectWrapper(BeanFactory beanFactory) {
 			return new SeataFeignObjectWrapper(beanFactory);
 		}
 	}

spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/hystrix/SeataHystrixAutoConfiguration.java

@@ -30,7 +30,7 @@ import com.netflix.hystrix.HystrixCommand;
 public class SeataHystrixAutoConfiguration {
 
 	@Bean
-	SeataHystrixConcurrencyStrategy fescarHystrixConcurrencyStrategy() {
+	SeataHystrixConcurrencyStrategy seataHystrixConcurrencyStrategy() {
 		return new SeataHystrixConcurrencyStrategy();
 	}
 

spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java

@@ -17,7 +17,7 @@ package org.springframework.cloud.alibaba.seata.feign.hystrix;
 
 import java.util.concurrent.Callable;
 
-import com.alibaba.fescar.core.context.RootContext;
+import io.seata.core.context.RootContext;
 
 import com.netflix.hystrix.strategy.HystrixPlugins;
 import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
@@ -37,7 +37,7 @@ public class SeataHystrixConcurrencyStrategy extends HystrixConcurrencyStrategy
 
 	@Override
 	public <K> Callable<K> wrapCallable(Callable<K> c) {
-		if (c instanceof FescarContextCallable) {
+		if (c instanceof SeataContextCallable) {
 			return c;
 		}
 
@@ -48,19 +48,19 @@ public class SeataHystrixConcurrencyStrategy extends HystrixConcurrencyStrategy
 		else {
 			wrappedCallable = c;
 		}
-		if (wrappedCallable instanceof FescarContextCallable) {
+		if (wrappedCallable instanceof SeataContextCallable) {
 			return wrappedCallable;
 		}
 
-		return new FescarContextCallable<>(wrappedCallable);
+		return new SeataContextCallable<>(wrappedCallable);
 	}
 
-	private static class FescarContextCallable<K> implements Callable<K> {
+	private static class SeataContextCallable<K> implements Callable<K> {
 
 		private final Callable<K> actual;
 		private final String xid;
 
-		FescarContextCallable(Callable<K> actual) {
+		SeataContextCallable(Callable<K> actual) {
 			this.actual = actual;
 			this.xid = RootContext.getXID();
 		}

spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/rest/SeataRestTemplateAutoConfiguration.java

@@ -50,7 +50,7 @@ import java.util.List;
 public class SeataRestTemplateAutoConfiguration {
 
 	@Bean
-	public SeataRestTemplateInterceptor fescarRestTemplateInterceptor() {
+	public SeataRestTemplateInterceptor seataRestTemplateInterceptor() {
 		return new SeataRestTemplateInterceptor();
 	}
 

spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/rest/SeataRestTemplateInterceptor.java

@@ -18,7 +18,7 @@ package org.springframework.cloud.alibaba.seata.rest;
 
 import java.io.IOException;
 
-import com.alibaba.fescar.core.context.RootContext;
+import io.seata.core.context.RootContext;
 
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;

spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/web/SeataHandlerInterceptor.java

@@ -19,7 +19,7 @@ package org.springframework.cloud.alibaba.seata.web;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.alibaba.fescar.core.context.RootContext;
+import io.seata.core.context.RootContext;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,10 +29,10 @@ import org.springframework.web.servlet.HandlerInterceptor;
 /**
  * @author xiaojing
  *
- * Fescar HandlerInterceptor, Convert Fescar information into
+ * Seata HandlerInterceptor, Convert Seata information into
- * @see com.alibaba.fescar.core.context.RootContext from http request's header in
+ * @see io.seata.core.context.RootContext from http request's header in
  * {@link org.springframework.web.servlet.HandlerInterceptor#preHandle(HttpServletRequest , HttpServletResponse , Object )},
- * And clean up Fescar information after servlet method invocation in
+ * And clean up Seata information after servlet method invocation in
  * {@link org.springframework.web.servlet.HandlerInterceptor#afterCompletion(HttpServletRequest, HttpServletResponse, Object, Exception)}
  */
 public class SeataHandlerInterceptor implements HandlerInterceptor {
@@ -42,7 +42,7 @@ public class SeataHandlerInterceptor implements HandlerInterceptor {
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response,
-			Object handler) throws Exception {
+			Object handler) {
 
 		String xid = RootContext.getXID();
 		String rpcXid = request.getHeader(RootContext.KEY_XID);
@@ -61,7 +61,7 @@ public class SeataHandlerInterceptor implements HandlerInterceptor {
 
 	@Override
 	public void afterCompletion(HttpServletRequest request, HttpServletResponse response,
-			Object handler, Exception e) throws Exception {
+			Object handler, Exception e) {
 
 		String rpcXid = request.getHeader(RootContext.KEY_XID);